diff --git a/audio/fasttracker2/Makefile b/audio/fasttracker2/Makefile index a5af8d48946..e1ad6da1338 100644 --- a/audio/fasttracker2/Makefile +++ b/audio/fasttracker2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fasttracker2 -DISTVERSION= 0.1-b149 +DISTVERSION= 0.1-b150 CATEGORIES= audio MASTER_SITES= https://16-bits.org/ \ LOCAL/ehaupt diff --git a/audio/fasttracker2/distinfo b/audio/fasttracker2/distinfo index af59743151f..7ce8d23363e 100644 --- a/audio/fasttracker2/distinfo +++ b/audio/fasttracker2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555658970 -SHA256 (ft2clone-b149-code.zip) = d6c5b8ce2ac0a973ea2632e6ee0215daa8c902ebcdb23465775a6004164d79b1 -SIZE (ft2clone-b149-code.zip) = 3425082 +TIMESTAMP = 1556007856 +SHA256 (ft2clone-b150-code.zip) = 08ca9ab970f5024b8f370deb15f71865324c1c18d6b63b13b1f705c52f3ec43f +SIZE (ft2clone-b150-code.zip) = 3425078 diff --git a/benchmarks/py-locust/Makefile b/benchmarks/py-locust/Makefile index 780e7dd8d8b..dc847802d2a 100644 --- a/benchmarks/py-locust/Makefile +++ b/benchmarks/py-locust/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= locust -PORTVERSION= 0.9.0 +PORTVERSION= 0.11.0 CATEGORIES= benchmarks www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,6 +11,7 @@ MAINTAINER= egypcio@FreeBSD.org COMMENT= Python utility for doing easy, distributed load testing LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gevent>=1.2.2:devel/py-gevent@${PY_FLAVOR} \ @@ -21,12 +22,15 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes OPTIONS_DEFINE= EXAMPLES +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/extra-EXAMPLES* ${STAGEDIR}${EXAMPLESDIR} diff --git a/benchmarks/py-locust/distinfo b/benchmarks/py-locust/distinfo index a5556db826b..2d5d7be1a1e 100644 --- a/benchmarks/py-locust/distinfo +++ b/benchmarks/py-locust/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547833536 -SHA256 (locustio-0.9.0.tar.gz) = c77b471e0e08e215c93a7af9a95b79193268072873fbbc0effca40f3d9b58be4 -SIZE (locustio-0.9.0.tar.gz) = 226870 +TIMESTAMP = 1555083697 +SHA256 (locustio-0.11.0.tar.gz) = 93404f831114791b0756325c53b08bff73f048eeb69688be657629feaa62b507 +SIZE (locustio-0.11.0.tar.gz) = 229879 diff --git a/biology/Makefile b/biology/Makefile index b1c2b00e8ba..4ceee59bafa 100644 --- a/biology/Makefile +++ b/biology/Makefile @@ -66,6 +66,7 @@ SUBDIR += mafft SUBDIR += mapm3 SUBDIR += migrate + SUBDIR += minimap2 SUBDIR += molden SUBDIR += mopac SUBDIR += mrbayes diff --git a/biology/bowtie2/Makefile b/biology/bowtie2/Makefile index 28b09185e6b..39d8b118064 100644 --- a/biology/bowtie2/Makefile +++ b/biology/bowtie2/Makefile @@ -11,7 +11,8 @@ COMMENT= Ultrafast, memory-efficient short read aligner LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -# May also work on other 64-bit platforms, but untested +# Requires a 64-bit processor and depends on hard-coded SSE instructions +# Experimental support for AARCH64 as of 2.3.5 ONLY_FOR_ARCHS= amd64 LIB_DEPENDS= libtbb.so:devel/tbb RUN_DEPENDS= bash:shells/bash diff --git a/biology/minimap2/Makefile b/biology/minimap2/Makefile new file mode 100644 index 00000000000..528872dd26b --- /dev/null +++ b/biology/minimap2/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= minimap2 +DISTVERSIONPREFIX= v +DISTVERSION= 2.16 +CATEGORIES= biology + +MAINTAINER= jwb@FreeBSD.org +COMMENT= Pairwise aligner for genomic and spliced nucleotide sequences + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +# Depends on hard-coded SSE instructions +# There appears to be some support for AARCH64 as well +ONLY_FOR_ARCHS= amd64 i386 + +USES= gmake +USE_GITHUB= yes +GH_ACCOUNT= lh3 + +INSTALL_TARGET= install-strip +PLIST_FILES= bin/minimap2 man/man1/minimap2.1.gz + +.include diff --git a/biology/minimap2/distinfo b/biology/minimap2/distinfo new file mode 100644 index 00000000000..4167b37be74 --- /dev/null +++ b/biology/minimap2/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1555901297 +SHA256 (lh3-minimap2-v2.16_GH0.tar.gz) = 9d4f1c9f1c2b29c2560b7ad53b2210dabd82161a0f88184f423534bd289433c3 +SIZE (lh3-minimap2-v2.16_GH0.tar.gz) = 221287 diff --git a/biology/minimap2/files/patch-Makefile b/biology/minimap2/files/patch-Makefile new file mode 100644 index 00000000000..19bf99b1325 --- /dev/null +++ b/biology/minimap2/files/patch-Makefile @@ -0,0 +1,40 @@ +--- Makefile.orig 2019-02-28 20:49:24 UTC ++++ Makefile +@@ -1,11 +1,19 @@ +-CFLAGS= -g -Wall -O2 -Wc++-compat #-Wextra +-CPPFLAGS= -DHAVE_KALLOC ++CFLAGS?= -g -Wall -O2 ++CFLAGS+= -Wc++-compat #-Wextra ++CPPFLAGS+= -DHAVE_KALLOC + INCLUDES= + OBJS= kthread.o kalloc.o misc.o bseq.o sketch.o sdust.o options.o index.o chain.o align.o hit.o map.o format.o pe.o esterr.o splitidx.o ksw2_ll_sse.o + PROG= minimap2 + PROG_EXTRA= sdust minimap2-lite + LIBS= -lm -lz -lpthread + ++PREFIX?= /usr/local ++DESTDIR?= . ++MAN1DIR?= ${PREFIX}/man/man1 ++MKDIR?= mkdir ++INSTALL?= install ++STRIP?= strip ++ + ifeq ($(arm_neon),) # if arm_neon is not defined + ifeq ($(sse2only),) # if sse2only is not defined + OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o +@@ -84,6 +92,15 @@ ksw2_exts2_neon.o:ksw2_exts2_sse.c ksw2.h kalloc.h + $(CC) -c $(CFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@ + + # other non-file targets ++ ++install: all ++ ${MKDIR} -p ${DESTDIR}${PREFIX}/bin ++ ${MKDIR} -p ${DESTDIR}${MAN1DIR} ++ ${INSTALL} -c minimap2 ${DESTDIR}${PREFIX}/bin ++ ${INSTALL} -c minimap2.1 ${DESTDIR}${MAN1DIR} ++ ++install-strip: install ++ ${STRIP} ${DESTDIR}${PREFIX}/bin/minimap2 + + clean: + rm -fr gmon.out *.o a.out $(PROG) $(PROG_EXTRA) *~ *.a *.dSYM build dist mappy*.so mappy.c python/mappy.c mappy.egg* diff --git a/biology/minimap2/pkg-descr b/biology/minimap2/pkg-descr new file mode 100644 index 00000000000..a9d86305f0f --- /dev/null +++ b/biology/minimap2/pkg-descr @@ -0,0 +1,18 @@ +Minimap2 is a versatile sequence alignment program that aligns DNA or mRNA +sequences against a large reference database. Typical use cases include: + +(1) mapping PacBio or Oxford Nanopore genomic reads to the human genome + +(2) finding overlaps between long reads with error rate up to ~15% + +(3) splice-aware alignment of PacBio Iso-Seq or Nanopore cDNA or Direct RNA + readsagainst a reference genome + +(4) aligning Illumina single- or paired-end reads + +(5) assembly-to-assembly alignment + +(6) full-genome alignment between two closely related species with divergence + below ~15% + +WWW: https://github.com/lh3/minimap2 diff --git a/biology/p5-Bio-MAGETAB/Makefile b/biology/p5-Bio-MAGETAB/Makefile index e2941d7ca36..f16fc978680 100644 --- a/biology/p5-Bio-MAGETAB/Makefile +++ b/biology/p5-Bio-MAGETAB/Makefile @@ -3,7 +3,7 @@ PORTNAME= Bio-MAGETAB PORTVERSION= 1.31 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,7 +14,7 @@ COMMENT= Data model and utility API for the MAGE-TAB format LICENSE= GPLv2 BUILD_DEPENDS= ${RUN_DEPENDS} -xRUN_DEPENDS= p5-Date-Manip>=5.44:devel/p5-Date-Manip \ +RUN_DEPENDS= p5-Date-Manip>=5.44:devel/p5-Date-Manip \ p5-DateTime>=0.43.02:devel/p5-DateTime \ p5-DateTime-Format-DateManip>=0.04:devel/p5-DateTime-Format-DateManip \ p5-Email-Valid>=0.179:mail/p5-Email-Valid \ diff --git a/biology/star/Makefile b/biology/star/Makefile index 996b1da90a3..8bd75aba70a 100644 --- a/biology/star/Makefile +++ b/biology/star/Makefile @@ -3,6 +3,7 @@ PORTNAME= STAR DISTVERSION= 2.7.0f CATEGORIES= biology +PKGNAMEPREFIX= rna- MAINTAINER= jwb@FreeBSD.org COMMENT= Spliced Transcripts Alignment to a Reference diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index 1cc56750c5a..a084d7863b1 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -10,6 +10,9 @@ COMMENT= Qt-based GDS2 Viewer LICENSE= GPLv2 +BROKEN_i386= type 'hash' does not provide a call operator +BROKEN_sparc64= Does not compile on sparc64: gcc bug + USES= compiler:c++0x gmake gl python qt:5 USE_GITHUB= yes GH_ACCOUNT= KLayout @@ -31,8 +34,6 @@ MAKE_ENV= INSTALL_ROOT=${STAGEDIR} BUILD_WRKSRC= ${WRKSRC}/build-release INSTALL_WRKSRC= ${WRKSRC}/build-release -BROKEN_sparc64= Does not compile on sparc64: gcc bug - do-configure: cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${SH} build.sh \ diff --git a/chinese/gcin-gtk3/Makefile b/chinese/gcin-gtk3/Makefile index 04c56f069fe..31eac5b8ffd 100644 --- a/chinese/gcin-gtk3/Makefile +++ b/chinese/gcin-gtk3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.8 +PORTVERSION= 2.8.9 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ PKGNAMESUFFIX= -gtk3 @@ -16,6 +16,7 @@ LICENSE= LGPL21 LIB_DEPENDS= libgcin-im-client.so:chinese/gcin WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/gtk3-im + USES= gmake gnome pkgconfig tar:xz USE_GNOME= gtk30 MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ diff --git a/chinese/gcin-gtk3/distinfo b/chinese/gcin-gtk3/distinfo index 34a61657aa1..af4240e8632 100644 --- a/chinese/gcin-gtk3/distinfo +++ b/chinese/gcin-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545105187 -SHA256 (gcin-2.8.8.tar.xz) = 22b64d519a28ac82e662f6107dbb8c829a80b07a216a8b00e64103feacb031f3 -SIZE (gcin-2.8.8.tar.xz) = 4035876 +TIMESTAMP = 1556113892 +SHA256 (gcin-2.8.9.tar.xz) = e08426cc85c5932392ebf73ac7d140cd778862517c3ea0cf8953aaab6c14d078 +SIZE (gcin-2.8.9.tar.xz) = 4033152 diff --git a/chinese/gcin-gtk3/pkg-message b/chinese/gcin-gtk3/pkg-message index b13494a9f57..4bbe064cb63 100644 --- a/chinese/gcin-gtk3/pkg-message +++ b/chinese/gcin-gtk3/pkg-message @@ -2,7 +2,7 @@ Remember to set these environment varibles (such as your ~/.xinitrc): export XMODIFIERS='@im=gcin' - export GTK_IM_MODULE=xim + export GTK_IM_MODULE=gcin # Finally, to start the GCIN input method daemon, use command: exec gcin & diff --git a/chinese/gcin-qt5/Makefile b/chinese/gcin-qt5/Makefile index 48222dda3ba..4fb2cdb9bc7 100644 --- a/chinese/gcin-qt5/Makefile +++ b/chinese/gcin-qt5/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.8 -PORTREVISION= 1 +PORTVERSION= 2.8.9 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ PKGNAMESUFFIX= -qt5 diff --git a/chinese/gcin-qt5/distinfo b/chinese/gcin-qt5/distinfo index b34fc46d564..e8f3b7bd02c 100644 --- a/chinese/gcin-qt5/distinfo +++ b/chinese/gcin-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545123484 -SHA256 (gcin-2.8.8.tar.xz) = 22b64d519a28ac82e662f6107dbb8c829a80b07a216a8b00e64103feacb031f3 -SIZE (gcin-2.8.8.tar.xz) = 4035876 +TIMESTAMP = 1556114580 +SHA256 (gcin-2.8.9.tar.xz) = e08426cc85c5932392ebf73ac7d140cd778862517c3ea0cf8953aaab6c14d078 +SIZE (gcin-2.8.9.tar.xz) = 4033152 diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 892391d279f..c05120d7b83 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.8 +PORTVERSION= 2.8.9 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.xz @@ -16,10 +16,10 @@ BROKEN_powerpc64= fails to build: gmake[3]: *** [Makefile:30: en-american] Error LIB_DEPENDS= libcurl.so:ftp/curl -USES= gmake pkgconfig tar:xz +USES= gmake gnome pkgconfig tar:xz HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --use_gtk3=N --use_qt3=N --use_qt4=N --use_qt5=N -USE_GNOME= gtk20 +CONFIGURE_ARGS+= --use_gtk3=N --use_qt5=N +USE_GNOME= gtk30 USE_XORG= x11 xtst xext INSTALLS_ICONS= YES USE_LDCONFIG= ${PREFIX}/lib/gcin @@ -43,7 +43,7 @@ post-patch: s,%%PREFIX%%,${PREFIX},;' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ - ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile + ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ ${WRKSRC}/scripts/Makefile @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ @@ -54,8 +54,6 @@ post-patch: @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; 12,13 s/=/ /; \ s/export/setenv/; s/$$UTF8ED/xdg-open/' \ ${WRKSRC}/scripts/html-browser - @${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,;' \ - ${WRKSRC}/gtk-im/gtkimcontextgcin.c @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \ ${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \ diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo index 49ebe06d349..8a59abec8f6 100644 --- a/chinese/gcin/distinfo +++ b/chinese/gcin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545093618 -SHA256 (gcin-2.8.8.tar.xz) = 22b64d519a28ac82e662f6107dbb8c829a80b07a216a8b00e64103feacb031f3 -SIZE (gcin-2.8.8.tar.xz) = 4035876 +TIMESTAMP = 1552571155 +SHA256 (gcin-2.8.9.tar.xz) = e08426cc85c5932392ebf73ac7d140cd778862517c3ea0cf8953aaab6c14d078 +SIZE (gcin-2.8.9.tar.xz) = 4033152 diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile index 6370603162f..a60045f0eed 100644 --- a/chinese/gcin/files/patch-Makefile +++ b/chinese/gcin/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2017-11-18 04:48:43 UTC +--- Makefile.orig 2019-03-07 09:07:52 UTC +++ Makefile @@ -4,8 +4,11 @@ include config.mak include suffixes-rule @@ -26,27 +26,28 @@ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \ table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o \ pho2pinyin.o pinyin.o lang.o gtab-list.o gtab-init.o fullchar.o \ -@@ -103,7 +110,7 @@ PROGS_CV=kbmcv pin-juyin +@@ -102,8 +109,7 @@ PROGS_CV=kbmcv pin-juyin + all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec $(MAKE) -C data - $(MAKE) -C gtk-im +- $(MAKE) -C gtk-im - if [ $(BUILD_MODULE) = 'Y' ]; then $(MAKE) -C modules; fi + $(MAKE) -C modules if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi -@@ -113,18 +120,18 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) +@@ -113,18 +119,18 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path) gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/local/$(LIB) ++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L%%PREFIX%%/$(LIB) rm -f core.* vgcore.* ln -sf $@ $@.test gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB) ++ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB) rm -f core.* -tslearn: $(OBJS_TSLEARN) @@ -58,7 +59,7 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client -lcurl $(LDFLAGS) ts-contribute: ts-edit -@@ -171,16 +178,16 @@ gtab-merge: $(OBJS_gtab_merge) +@@ -171,16 +177,16 @@ gtab-merge: $(OBJS_gtab_merge) kbmcv: $(OBJS_kbmcv) $(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS) @@ -79,10 +80,11 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS) pin-juyin: $(OBJS_pin_juyin) -@@ -229,23 +236,19 @@ install: +@@ -228,24 +234,19 @@ install: + install -d $(bindir) $(MAKE) -C data install $(MAKE) -C im-client install - $(MAKE) -C gtk-im install +- $(MAKE) -C gtk-im install - if [ $(BUILD_MODULE) = 'Y' ]; then $(MAKE) -C modules install; fi + $(MAKE) -C modules install if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im install; fi @@ -106,7 +108,7 @@ install -s $(PROGS) $(bindir); \ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \ -@@ -253,6 +256,7 @@ install: +@@ -253,6 +254,7 @@ install: rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \ fi $(MAKE) -C scripts install @@ -114,7 +116,15 @@ $(MAKE) -C menu install if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po install; fi -@@ -286,5 +290,3 @@ gcin.spec: gcin.spec.in +@@ -261,7 +263,6 @@ clean: + $(MAKE) -C data clean + $(MAKE) -C scripts clean + $(MAKE) -C im-client clean +- $(MAKE) -C gtk-im clean + $(MAKE) -C modules clean + if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im clean; fi + $(MAKE) -C qt-im clean +@@ -286,5 +287,3 @@ gcin.spec: gcin.spec.in gcin-fedora.spec: gcin-fedora.spec.in VERSION.gcin rm -f $@ sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@ diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure index db9623513d8..d23acdcbc87 100644 --- a/chinese/gcin/files/patch-configure +++ b/chinese/gcin/files/patch-configure @@ -1,4 +1,4 @@ ---- configure.orig 2018-05-12 11:15:17 UTC +--- configure.orig 2019-02-01 23:11:02 UTC +++ configure @@ -1,4 +1,4 @@ -##!/bin/bash @@ -47,10 +47,10 @@ grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec else - for i in /usr/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc /usr/share/qt3/bin/moc /usr/lib64/qt3/bin/moc -+ for i in $prefix/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc /usr/share/qt3/bin/moc /usr/lib64/qt3/bin/moc ++ for i in $prefix/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc $prefix/share/qt3/bin/moc /usr/lib64/qt3/bin/moc do - [ ! -x $i ] && continue -+ [ ! -x $i ] & continue ++ [ ! -x $i ] continue QT_MOC=$i echo "QT_MOC=$QT_MOC" break; diff --git a/chinese/gcin/files/patch-gcb.cpp b/chinese/gcin/files/patch-gcb.cpp index 97336e1f66c..bee76f24804 100644 --- a/chinese/gcin/files/patch-gcb.cpp +++ b/chinese/gcin/files/patch-gcb.cpp @@ -1,4 +1,4 @@ ---- gcb.cpp.orig 2015-11-22 23:15:12 UTC +--- gcb.cpp.orig 2019-03-06 00:33:25 UTC +++ gcb.cpp @@ -1,3 +1,4 @@ +#if USE_GCB @@ -13,9 +13,12 @@ static GtkWidget *mainwin; static GtkClipboard *pclipboard_clipboard, *pclipboard_primary; static GtkWidget **buttonArr; -@@ -529,4 +531,4 @@ void free_gcb() { - g_free(buttonStr); buttonStr = NULL; +@@ -256,7 +258,7 @@ static void get_mouse_button( GtkWidget *widget,GdkEve + } } - +#endif + static void hist_get_mouse_button( GtkWidget *widget,GdkEventButton *event, gpointer data) + { + int i; diff --git a/chinese/gcin/files/patch-im-client_Makefile b/chinese/gcin/files/patch-im-client_Makefile new file mode 100644 index 00000000000..7e6f60da437 --- /dev/null +++ b/chinese/gcin/files/patch-im-client_Makefile @@ -0,0 +1,14 @@ +--- im-client/Makefile.orig 2011-12-17 06:16:17 UTC ++++ im-client/Makefile +@@ -20,10 +20,9 @@ OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o g + $(CC) -x c -c $(CFLAGS) $< + + $(SOFILEVER): $(OBJS) +- $(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -lX11 -o $@ -L/usr/X11R6/lib ++ $(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -lX11 -o $@ -L/usr/local/lib + ln -sf $(SOFILEVER) $(SOFILE) + ln -sf $(SOFILEVER) $(SOFILE).1 +- $(MAKE) -C ../gtk-im + + LOCALLIB=/usr/local/$(LIB) + diff --git a/chinese/gcin/pkg-message b/chinese/gcin/pkg-message index b13494a9f57..4bbe064cb63 100644 --- a/chinese/gcin/pkg-message +++ b/chinese/gcin/pkg-message @@ -2,7 +2,7 @@ Remember to set these environment varibles (such as your ~/.xinitrc): export XMODIFIERS='@im=gcin' - export GTK_IM_MODULE=xim + export GTK_IM_MODULE=gcin # Finally, to start the GCIN input method daemon, use command: exec gcin & diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist index f8088e3cd6d..9def0033a0f 100644 --- a/chinese/gcin/pkg-plist +++ b/chinese/gcin/pkg-plist @@ -28,7 +28,6 @@ lib/gcin/intcode-module.so lib/gcin/libgcin-im-client.so lib/gcin/libgcin-im-client.so.1 lib/gcin/libgcin-im-client.so.1.2.5 -lib/gtk-2.0/immodules/im-gcin.so man/man1/gcin-exit.1.gz man/man1/gcin-gb-toggle.1.gz man/man1/gcin-kbm-toggle.1.gz @@ -167,5 +166,3 @@ share/icons/gcin/vocabulary.png share/icons/gcin/wm2.png share/icons/gcin/wubi.png share/icons/hicolor/64x64/apps/gcin.png -@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache diff --git a/comms/qrq/Makefile b/comms/qrq/Makefile index b3285c5725f..a22ad59c6a0 100644 --- a/comms/qrq/Makefile +++ b/comms/qrq/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= qrq -PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTVERSION= 0.3.2 CATEGORIES= comms hamradio MASTER_SITES= http://fkurz.net/ham/qrq/ @@ -12,9 +11,12 @@ COMMENT= Morse telegraphy trainer similar to the classic DOS version by DL4MM LICENSE= GPLv2 USES= gmake ncurses shebangfix + SHEBANG_FILES= qrqscore post-install: ${INSTALL_DATA} ${WRKSRC}/qrq.png ${STAGEDIR}${DATADIR}/qrq.png +MAKE_ENV= DESTDIR=${LOCALBASE} + .include diff --git a/comms/qrq/distinfo b/comms/qrq/distinfo index 4c68d50fadb..513cd30574e 100644 --- a/comms/qrq/distinfo +++ b/comms/qrq/distinfo @@ -1,2 +1,3 @@ -SHA256 (qrq-0.3.1.tar.gz) = 92988a33b7eddb3941cf91a285a57f4f0872722adf003350a8afe2caf83159a1 -SIZE (qrq-0.3.1.tar.gz) = 131508 +TIMESTAMP = 1556007902 +SHA256 (qrq-0.3.2.tar.gz) = f340aa1e99a1c7752fe3600828a6596354485fffdb66a39eaf79227ac24ac43c +SIZE (qrq-0.3.2.tar.gz) = 132546 diff --git a/comms/qrq/files/patch-Makefile b/comms/qrq/files/patch-Makefile index 56278be71d8..cf241a0e0c7 100644 --- a/comms/qrq/files/patch-Makefile +++ b/comms/qrq/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2013-01-06 14:14:09 UTC +--- Makefile.orig 2019-03-09 20:14:52 UTC +++ Makefile @@ -8,7 +8,7 @@ DESTDIR?=/usr USE_CA=NO @@ -9,15 +9,18 @@ # set to YES if you compile with MINGW32 USE_WIN32=NO -@@ -26,7 +26,6 @@ ifneq ($(OSX_PLATFORM), YES) +@@ -27,8 +27,8 @@ endif + + ifeq ($(USE_WIN32), YES) + CC=i686-w64-mingw32-gcc-posix +-else +- CC=gcc ++#else ++# CC=gcc endif - CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" -I. --CC=gcc - - ifeq ($(USE_CA), YES) - OBJECTS=qrq.o coreaudio.o -@@ -95,16 +94,14 @@ uninstall: + # build information may be added by CI scripts and will be +@@ -104,16 +104,14 @@ uninstall: else install: qrq diff --git a/databases/cego/Makefile b/databases/cego/Makefile index 840b0a8e0f2..4a9ccc51b5e 100644 --- a/databases/cego/Makefile +++ b/databases/cego/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cego -PORTVERSION= 2.44.5 +PORTVERSION= 2.44.6 CATEGORIES= databases MASTER_SITES= http://www.lemke-it.com/ diff --git a/databases/cego/distinfo b/databases/cego/distinfo index a879b6ec390..9071c040d58 100644 --- a/databases/cego/distinfo +++ b/databases/cego/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555941194 -SHA256 (cego-2.44.5.tar.gz) = df95be291cb7c02576257622dc650d5e0bddeb60afbc247cab722bef7a20921d -SIZE (cego-2.44.5.tar.gz) = 2797394 +TIMESTAMP = 1556020020 +SHA256 (cego-2.44.6.tar.gz) = 2b15e0c0b16e73588cf1b500fd2137ea83135d02c6ee6efe7ebe0b8991887c3d +SIZE (cego-2.44.6.tar.gz) = 2798303 diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index 7627567db56..0a4f02c27f4 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= memcached -PORTVERSION= 1.5.12 +PORTVERSION= 1.5.13 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo index 881634bc7dd..be7c06e684e 100644 --- a/databases/memcached/distinfo +++ b/databases/memcached/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543291520 -SHA256 (memcached-1.5.12.tar.gz) = c02f97d5685617b209fbe25f3464317b234d765b427d254c2413410a5c095b29 -SIZE (memcached-1.5.12.tar.gz) = 457719 +TIMESTAMP = 1556052101 +SHA256 (memcached-1.5.13.tar.gz) = 61e1a774949735a9eb6e40992bb04083d8427f3d0ce1a52a15c0116db39c4d63 +SIZE (memcached-1.5.13.tar.gz) = 483697 diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile index b49f12519dd..538ce07bf77 100644 --- a/databases/puppetdb-terminus6/Makefile +++ b/databases/puppetdb-terminus6/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= puppetdb-terminus -PORTVERSION= 6.3.0 +PORTVERSION= 6.3.1 CATEGORIES= databases ruby MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 6 diff --git a/databases/puppetdb-terminus6/distinfo b/databases/puppetdb-terminus6/distinfo index ab1eff89162..0d5d86fd236 100644 --- a/databases/puppetdb-terminus6/distinfo +++ b/databases/puppetdb-terminus6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554308541 -SHA256 (puppetdb-6.3.0.tar.gz) = 92b1f4d93adda65fc2082d58e15a1299c5c6516f10ceb942e4379a3dbc6548e7 -SIZE (puppetdb-6.3.0.tar.gz) = 41678795 +TIMESTAMP = 1555531514 +SHA256 (puppetdb-6.3.1.tar.gz) = 7bac6a9254731f869b37382b97454064ad6e997bded793b94a120ceceb3f039b +SIZE (puppetdb-6.3.1.tar.gz) = 41706703 diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile index 8d6e00097a8..9b8059acb15 100644 --- a/databases/puppetdb6/Makefile +++ b/databases/puppetdb6/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= puppetdb -PORTVERSION= 6.3.0 +PORTVERSION= 6.3.1 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 6 diff --git a/databases/puppetdb6/distinfo b/databases/puppetdb6/distinfo index 28859d855c4..8f6c56e5e41 100644 --- a/databases/puppetdb6/distinfo +++ b/databases/puppetdb6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554308519 -SHA256 (puppetdb-6.3.0.tar.gz) = 92b1f4d93adda65fc2082d58e15a1299c5c6516f10ceb942e4379a3dbc6548e7 -SIZE (puppetdb-6.3.0.tar.gz) = 41678795 +TIMESTAMP = 1555531506 +SHA256 (puppetdb-6.3.1.tar.gz) = 7bac6a9254731f869b37382b97454064ad6e997bded793b94a120ceceb3f039b +SIZE (puppetdb-6.3.1.tar.gz) = 41706703 diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index 2af3ebe6a70..fb41fd6f25c 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 6.0.1 +PORTVERSION= 6.0.2 DISTVERSIONPREFIX= v CATEGORIES= databases diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index 57b33e4b9e7..8d532fe5778 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555592228 -SHA256 (facebook-rocksdb-v6.0.1_GH0.tar.gz) = 9a9aca15bc3617729d976ceb98f6cbd64c6c25c4d92f374b4897aa2d2faa07cf -SIZE (facebook-rocksdb-v6.0.1_GH0.tar.gz) = 5445103 +TIMESTAMP = 1556118458 +SHA256 (facebook-rocksdb-v6.0.2_GH0.tar.gz) = 89e0832f1fb00ac240a9438d4bbdae37dd3e52f7c15c3f646dc26887da16f342 +SIZE (facebook-rocksdb-v6.0.2_GH0.tar.gz) = 5445260 diff --git a/devel/Makefile b/devel/Makefile index 49a2fef09cc..73622ed9a67 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -105,6 +105,7 @@ SUBDIR += amd64-binutils SUBDIR += amd64-gcc SUBDIR += amd64-xtoolchain-gcc + SUBDIR += amqp-cpp SUBDIR += android-tools-adb SUBDIR += android-tools-fastboot SUBDIR += android-tools-simpleperf @@ -4121,6 +4122,7 @@ SUBDIR += phpunit7 SUBDIR += phpunit8 SUBDIR += physfs + SUBDIR += picojson SUBDIR += picp SUBDIR += picprog SUBDIR += pig @@ -4933,6 +4935,7 @@ SUBDIR += py-prettytable SUBDIR += py-prioritized_methods SUBDIR += py-proglog + SUBDIR += py-progress SUBDIR += py-promise SUBDIR += py-prompt_toolkit SUBDIR += py-prompt_toolkit1 @@ -5944,6 +5947,7 @@ SUBDIR += rubygem-pry-rails SUBDIR += rubygem-pry-remote-em SUBDIR += rubygem-ptreloaded + SUBDIR += rubygem-puppet-resource_api SUBDIR += rubygem-pygments.rb SUBDIR += rubygem-r18n-core SUBDIR += rubygem-rabl @@ -5977,7 +5981,6 @@ SUBDIR += rubygem-react-rails-rails5 SUBDIR += rubygem-readwritesettings SUBDIR += rubygem-recaptcha - SUBDIR += rubygem-recaptcha3 SUBDIR += rubygem-recursive-open-struct SUBDIR += rubygem-redis-activesupport SUBDIR += rubygem-redis-activesupport-rails5 diff --git a/devel/amqp-cpp/Makefile b/devel/amqp-cpp/Makefile new file mode 100644 index 00000000000..dfd328c7938 --- /dev/null +++ b/devel/amqp-cpp/Makefile @@ -0,0 +1,22 @@ +# $FreeBSD$ + +PORTNAME= AMQP-CPP +DISTVERSIONPREFIX= v +DISTVERSION= 4.1.4 +CATEGORIES= devel + +MAINTAINER= aleksandr.fedorov@vstack.com +COMMENT= C++ library for asynchronous non-blocking communication with RabbitMQ + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cmake compiler:c++11-lib +USE_LDCONFIG= yes + +CMAKE_ON= AMQP-CPP_LINUX_TCP AMQP-CPP_BUILD_SHARED + +USE_GITHUB= yes +GH_ACCOUNT= CopernicaMarketingSoftware + +.include diff --git a/devel/amqp-cpp/distinfo b/devel/amqp-cpp/distinfo new file mode 100644 index 00000000000..0ba9988c3d7 --- /dev/null +++ b/devel/amqp-cpp/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1555487571 +SHA256 (CopernicaMarketingSoftware-AMQP-CPP-v4.1.4_GH0.tar.gz) = 1e0d070d980e44a2293a94c416b5690ffc529e0246cc2ef079dec59773b9708b +SIZE (CopernicaMarketingSoftware-AMQP-CPP-v4.1.4_GH0.tar.gz) = 143444 diff --git a/devel/amqp-cpp/files/patch-src_linux__tcp_includes.h b/devel/amqp-cpp/files/patch-src_linux__tcp_includes.h new file mode 100644 index 00000000000..969b9f53919 --- /dev/null +++ b/devel/amqp-cpp/files/patch-src_linux__tcp_includes.h @@ -0,0 +1,10 @@ +--- src/linux_tcp/includes.h.orig 2019-04-24 08:29:32 UTC ++++ src/linux_tcp/includes.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + + // utility classes diff --git a/devel/amqp-cpp/pkg-descr b/devel/amqp-cpp/pkg-descr new file mode 100644 index 00000000000..dd0450fc12b --- /dev/null +++ b/devel/amqp-cpp/pkg-descr @@ -0,0 +1,3 @@ +AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker. + +WWW: https://github.com/CopernicaMarketingSoftware/AMQP-CPP diff --git a/devel/amqp-cpp/pkg-plist b/devel/amqp-cpp/pkg-plist new file mode 100644 index 00000000000..57ac00487b2 --- /dev/null +++ b/devel/amqp-cpp/pkg-plist @@ -0,0 +1,63 @@ +cmake/amqpcppConfig-%%CMAKE_BUILD_TYPE%%.cmake +cmake/amqpcppConfig.cmake +include/amqpcpp.h +include/amqpcpp/address.h +include/amqpcpp/addresses.h +include/amqpcpp/array.h +include/amqpcpp/booleanset.h +include/amqpcpp/buffer.h +include/amqpcpp/bytebuffer.h +include/amqpcpp/callbacks.h +include/amqpcpp/channel.h +include/amqpcpp/channelimpl.h +include/amqpcpp/classes.h +include/amqpcpp/connection.h +include/amqpcpp/connectionhandler.h +include/amqpcpp/connectionimpl.h +include/amqpcpp/copiedbuffer.h +include/amqpcpp/decimalfield.h +include/amqpcpp/deferred.h +include/amqpcpp/deferredcancel.h +include/amqpcpp/deferredconfirm.h +include/amqpcpp/deferredconsumer.h +include/amqpcpp/deferreddelete.h +include/amqpcpp/deferredextreceiver.h +include/amqpcpp/deferredget.h +include/amqpcpp/deferredpublisher.h +include/amqpcpp/deferredqueue.h +include/amqpcpp/deferredreceiver.h +include/amqpcpp/endian.h +include/amqpcpp/entityimpl.h +include/amqpcpp/envelope.h +include/amqpcpp/exception.h +include/amqpcpp/exchangetype.h +include/amqpcpp/field.h +include/amqpcpp/fieldproxy.h +include/amqpcpp/flags.h +include/amqpcpp/frame.h +include/amqpcpp/libboostasio.h +include/amqpcpp/libev.h +include/amqpcpp/libevent.h +include/amqpcpp/libuv.h +include/amqpcpp/linux_tcp.h +include/amqpcpp/linux_tcp/tcpchannel.h +include/amqpcpp/linux_tcp/tcpconnection.h +include/amqpcpp/linux_tcp/tcpdefines.h +include/amqpcpp/linux_tcp/tcphandler.h +include/amqpcpp/linux_tcp/tcpparent.h +include/amqpcpp/login.h +include/amqpcpp/message.h +include/amqpcpp/metadata.h +include/amqpcpp/monitor.h +include/amqpcpp/numericfield.h +include/amqpcpp/openssl.h +include/amqpcpp/outbuffer.h +include/amqpcpp/protocolexception.h +include/amqpcpp/receivedframe.h +include/amqpcpp/stack_ptr.h +include/amqpcpp/stringfield.h +include/amqpcpp/table.h +include/amqpcpp/watchable.h +lib/libamqpcpp.so +lib/libamqpcpp.so.4.1 +libdata/pkgconfig/amqpcpp.pc diff --git a/devel/catch/Makefile b/devel/catch/Makefile index c3f7dcf12dc..516062d5b86 100644 --- a/devel/catch/Makefile +++ b/devel/catch/Makefile @@ -3,7 +3,7 @@ PORTNAME= catch DISTVERSIONPREFIX= v -DISTVERSION= 2.7.1 +DISTVERSION= 2.7.2 PORTREVISION= 0 CATEGORIES= devel diff --git a/devel/catch/distinfo b/devel/catch/distinfo index 146b3084d0f..754c015c071 100644 --- a/devel/catch/distinfo +++ b/devel/catch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554799917 -SHA256 (catchorg-Catch2-v2.7.1_GH0.tar.gz) = 04b303517284572c277597004a33c3f8c02a4d12ba73d5a4cb73b4a369dfef0b -SIZE (catchorg-Catch2-v2.7.1_GH0.tar.gz) = 573626 +TIMESTAMP = 1556007749 +SHA256 (catchorg-Catch2-v2.7.2_GH0.tar.gz) = 9f4116da13d8402b5145f95ab91ae0173cd27b804152d3bb2d4f9b6e64852af7 +SIZE (catchorg-Catch2-v2.7.2_GH0.tar.gz) = 576963 diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile index 6ca48f5a3e6..fb6f4019658 100644 --- a/devel/git-lfs/Makefile +++ b/devel/git-lfs/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-lfs DISTVERSIONPREFIX= v -DISTVERSION= 2.7.1 +DISTVERSION= 2.7.2 CATEGORIES= devel MAINTAINER= egypcio@FreeBSD.org diff --git a/devel/git-lfs/distinfo b/devel/git-lfs/distinfo index 61cd307bf48..2674371765f 100644 --- a/devel/git-lfs/distinfo +++ b/devel/git-lfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551345706 -SHA256 (git-lfs-git-lfs-v2.7.1_GH0.tar.gz) = af60c2370d135ab13724d302a0b1c226ec9fb0ee6d29ecc335e9add4c86497b4 -SIZE (git-lfs-git-lfs-v2.7.1_GH0.tar.gz) = 1670764 +TIMESTAMP = 1556093086 +SHA256 (git-lfs-git-lfs-v2.7.2_GH0.tar.gz) = e65659f12ec557ae8c778c01ca62d921413221864b68bd93cfa41399028ae67f +SIZE (git-lfs-git-lfs-v2.7.2_GH0.tar.gz) = 1672700 diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 5c9351059bd..34ae46c9dc5 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 1.27.1 +DISTVERSION= 1.33.0 PORTREVISION= 1 CATEGORIES= devel @@ -12,23 +12,23 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.18:devel/git \ +MY_DEPENDS= git>=2.21:devel/git \ rubygem-bundler>=1.16.5:sysutils/rubygem-bundler \ rubygem-rugged>=0.28.0:devel/rubygem-rugged \ rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \ - rubygem-gitlab-markup>=1.6.5:textproc/rubygem-gitlab-markup \ - rubygem-gitaly-proto>=1.13.0:net/rubygem-gitaly-proto \ + rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \ + rubygem-gitaly-proto>=1.19.0:net/rubygem-gitaly-proto \ rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ - rubygem-gitlab-gollum-lib>=4.2:www/rubygem-gitlab-gollum-lib \ - rubygem-gitlab-gollum-rugged_adapter>=0.4.4:www/rubygem-gitlab-gollum-rugged_adapter \ + rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \ + rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2:www/rubygem-gitlab-gollum-rugged_adapter \ rubygem-grpc>=1.15.0:net/rubygem-grpc \ - rubygem-sentry-raven>=2.7.2:devel/rubygem-sentry-raven \ + rubygem-sentry-raven>=2.9.0:devel/rubygem-sentry-raven \ rubygem-faraday>=0.12:www/rubygem-faraday \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf -BUILD_DEPENDS= go>=1.10:lang/go \ +BUILD_DEPENDS= go>=1.11:lang/go \ gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ @@ -40,7 +40,7 @@ USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= a3648fa4ba39e937093c10802ddc26aa00c58e9b +GL_COMMIT= 800f4ff3272bc519b71cbc7b95d937978d2c53aa post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 175ca3d2c60..4a6028f69dc 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553767951 -SHA256 (gitlab-org-gitaly-a3648fa4ba39e937093c10802ddc26aa00c58e9b_GL0.tar.gz) = 672ed410ad0961302a51de833e5247fa8ed55a0c59082e0e1ccede58524eb354 -SIZE (gitlab-org-gitaly-a3648fa4ba39e937093c10802ddc26aa00c58e9b_GL0.tar.gz) = 4691407 +TIMESTAMP = 1555691732 +SHA256 (gitlab-org-gitaly-800f4ff3272bc519b71cbc7b95d937978d2c53aa_GL0.tar.gz) = d38236048e19128ee5ddde0d9c4e2189851e89ebe18bc8ec0c1439286a5b3a25 +SIZE (gitlab-org-gitaly-800f4ff3272bc519b71cbc7b95d937978d2c53aa_GL0.tar.gz) = 4713844 diff --git a/devel/gitaly/files/patch-__support_makegen.go b/devel/gitaly/files/patch-__support_makegen.go index 463391135c1..7d3590e0881 100644 --- a/devel/gitaly/files/patch-__support_makegen.go +++ b/devel/gitaly/files/patch-__support_makegen.go @@ -1,4 +1,4 @@ ---- _support/makegen.go.orig 2019-03-25 09:02:26 UTC +--- _support/makegen.go.orig 2019-04-05 16:17:09 UTC +++ _support/makegen.go @@ -253,7 +253,7 @@ var templateText = ` # These variables may be overriden at runtime by top-level make @@ -9,7 +9,7 @@ ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly BUILD_TAGS := tracer_static tracer_static_jaeger -@@ -273,8 +273,8 @@ build: ../.ruby-bundle +@@ -274,8 +274,8 @@ build: ../.ruby-bundle # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 4ca9c9401be..f7620f1f62b 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -24,7 +24,7 @@ [[storage]] name = "default" -path = "/home/git/repositories" -+path = "/usr/home/git/repositories" ++path = "/usr/local/git/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index e3b5d6e7f18..719959804fd 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,13 +1,13 @@ ---- ruby/Gemfile.orig 2019-03-11 20:46:03 UTC +--- ruby/Gemfile.orig 2019-04-05 16:17:09 UTC +++ ruby/Gemfile @@ -8,7 +8,7 @@ gem 'github-linguist', '~> 6.1', require: 'linguist' - gem 'gitlab-markup', '~> 1.6.5' - gem 'gitaly-proto', '~> 1.13.0' + gem 'gitlab-markup', '~> 1.7.0' + gem 'gitaly-proto', '~> 1.19.0' gem 'activesupport', '~> 5.0.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' - gem 'gitlab-gollum-lib', '~> 4.2', require: false - gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false + gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false + gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false gem 'grpc', '~> 1.15.0' @@ -22,17 +22,3 @@ gem 'licensee', '~> 8.9.0' diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist index f4a72e6a36b..fb81e1e6d11 100644 --- a/devel/gitaly/pkg-plist +++ b/devel/gitaly/pkg-plist @@ -7,6 +7,111 @@ %%DATADIR%%/ruby/git-hooks/post-receive %%DATADIR%%/ruby/git-hooks/pre-receive %%DATADIR%%/ruby/git-hooks/update +%%DATADIR%%/ruby/gitlab-shell/.codeclimate.yml +%%DATADIR%%/ruby/gitlab-shell/.gitlab-ci.yml +%%DATADIR%%/ruby/gitlab-shell/.rubocop.yml +%%DATADIR%%/ruby/gitlab-shell/.ruby-version +%%DATADIR%%/ruby/gitlab-shell/CHANGELOG +%%DATADIR%%/ruby/gitlab-shell/CONTRIBUTING.md +%%DATADIR%%/ruby/gitlab-shell/Gemfile +%%DATADIR%%/ruby/gitlab-shell/LICENSE +%%DATADIR%%/ruby/gitlab-shell/README.md +%%DATADIR%%/ruby/gitlab-shell/README.orig.md +%%DATADIR%%/ruby/gitlab-shell/VERSION +%%DATADIR%%/ruby/gitlab-shell/bin/authorized_keys +%%DATADIR%%/ruby/gitlab-shell/bin/check +%%DATADIR%%/ruby/gitlab-shell/bin/compile +%%DATADIR%%/ruby/gitlab-shell/bin/create-hooks +%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-keys +%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-shell-authorized-keys-check +%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-shell-authorized-principals-check +%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-shell-ruby +%%DATADIR%%/ruby/gitlab-shell/bin/install +%%DATADIR%%/ruby/gitlab-shell/bin/test-logger +%%DATADIR%%/ruby/gitlab-shell/config.yml.example +%%DATADIR%%/ruby/gitlab-shell/lib/action.rb +%%DATADIR%%/ruby/gitlab-shell/lib/action/custom.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access_status.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_config.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_custom_hook.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_init.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_keys.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_lfs_authentication.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_logger.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_metrics.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net/errors.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_post_receive.rb +%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_shell.rb +%%DATADIR%%/ruby/gitlab-shell/lib/hooks_utils.rb +%%DATADIR%%/ruby/gitlab-shell/lib/http_helper.rb +%%DATADIR%%/ruby/gitlab-shell/lib/httpunix.rb +%%DATADIR%%/ruby/gitlab-shell/lib/object_dirs_helper.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_access_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_config_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_custom_hook_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_keys_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_lfs_authentication_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_logger_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_metrics_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_net_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_shell_authorized_keys_check_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_shell_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/hooks_utils_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/httpunix_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb +%%DATADIR%%/ruby/gitlab-shell/spec/spec_helper.rb +%%DATADIR%%/ruby/gitlab-shell/spec/support/gitlab_shell_setup.rb +%%DATADIR%%/ruby/gitlab-shell/spec/support/gl_id_test_hook +%%DATADIR%%/ruby/gitlab-shell/spec/support/hook_fail +%%DATADIR%%/ruby/gitlab-shell/spec/support/hook_ok +%%DATADIR%%/ruby/gitlab-shell/spec/support/http_unix_server.rb +%%DATADIR%%/ruby/gitlab-shell/spec/support/vcr.rb +%%DATADIR%%/ruby/gitlab-shell/spec/support/webmock.rb +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-json.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-not-json.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-not-json.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-with-message.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/discover-ok.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-download.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-found.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-implemented.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-ok.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml +%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml %%DATADIR%%/ruby/lib/gitaly_server.rb %%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb %%DATADIR%%/ruby/lib/gitaly_server/client.rb @@ -46,7 +151,6 @@ %%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb %%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb %%DATADIR%%/ruby/lib/gitlab/git/popen.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/remote_repository.rb @@ -66,7 +170,6 @@ %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb %%DATADIR%%/ruby/lib/gitlab/ref_matcher.rb %%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb -%%DATADIR%%/ruby/lib/gitlab/version_info.rb %%DATADIR%%/ruby/spec/factories/gitaly/commit.rb %%DATADIR%%/ruby/spec/factories/gitaly/commit_author.rb %%DATADIR%%/ruby/spec/factories/sequences.rb @@ -89,7 +192,6 @@ %%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/lfs_changes_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/popen_spec.rb -%%DATADIR%%/ruby/spec/lib/gitlab/git/raw_diff_change_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_mirror_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_client_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_spec.rb @@ -105,7 +207,6 @@ %%DATADIR%%/ruby/spec/lib/gitlab/git/user_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/wiki_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/ref_matcher_spec.rb -%%DATADIR%%/ruby/spec/lib/gitlab/version_info_spec.rb %%DATADIR%%/ruby/spec/spec_helper.rb %%DATADIR%%/ruby/spec/support/generate-seed-repo-rb %%DATADIR%%/ruby/spec/support/helpers/certs/gitalycert.pem @@ -115,116 +216,13 @@ %%DATADIR%%/ruby/spec/support/helpers/seed_repo.rb %%DATADIR%%/ruby/spec/support/sentry.rb %%DATADIR%%/ruby/spec/test_repo_helper.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/.codeclimate.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/.gitlab-ci.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/.rubocop.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/.ruby-version -%%DATADIR%%/ruby/vendor/gitlab-shell/CHANGELOG -%%DATADIR%%/ruby/vendor/gitlab-shell/CONTRIBUTING.md -%%DATADIR%%/ruby/vendor/gitlab-shell/Gemfile -%%DATADIR%%/ruby/vendor/gitlab-shell/LICENSE -%%DATADIR%%/ruby/vendor/gitlab-shell/README.md -%%DATADIR%%/ruby/vendor/gitlab-shell/README.orig.md -%%DATADIR%%/ruby/vendor/gitlab-shell/VERSION -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/authorized_keys -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/check -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/compile -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/create-hooks -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/gitlab-keys -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/gitlab-shell-authorized-keys-check -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/gitlab-shell-authorized-principals-check -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/gitlab-shell-ruby -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/install -%%DATADIR%%/ruby/vendor/gitlab-shell/bin/test-logger -%%DATADIR%%/ruby/vendor/gitlab-shell/config.yml.example -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/action.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/action/custom.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_access.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_access_status.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_config.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_custom_hook.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_init.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_keys.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_lfs_authentication.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_logger.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_metrics.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_net.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_net/errors.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_post_receive.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_shell.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/hooks_utils.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/http_helper.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/httpunix.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/lib/object_dirs_helper.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_access_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_config_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_custom_hook_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_keys_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_lfs_authentication_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_logger_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_metrics_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_net_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_post_receive_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_shell_authorized_keys_check_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/gitlab_shell_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/hooks_utils_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/httpunix_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/object_dirs_helper_spec.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/spec_helper.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/support/gl_id_test_hook -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/support/hook_fail -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/support/hook_ok -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/support/http_unix_server.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/support/vcr.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/support/webmock.rb -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/check-ok.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-json.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-not-json.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok-not-json.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok-with-message.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/discover-ok.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-download.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/post-receive.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/pre-receive.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-not-found.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-not-implemented.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-ok.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml -%%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml @(,,555) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook -@(,,555) %%DATADIR%%/ruby/vendor/gitlab-shell/hooks/post-receive -@(,,555) %%DATADIR%%/ruby/vendor/gitlab-shell/hooks/pre-receive -@(,,555) %%DATADIR%%/ruby/vendor/gitlab-shell/hooks/update +@(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/post-receive +@(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/pre-receive +@(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/update @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-debug @(,,555) %%DATADIR%%/bin/gitaly-ssh +@(,,555) %%DATADIR%%/bin/gitaly-wrapper @(,,555) %%DATADIR%%/bin/praefect @sample %%DATADIR%%/config.toml.sample diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index d956c264cd4..2a0f5ce7103 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gitlab-runner -PORTVERSION= 11.7.0 -PORTREVISION= 1 +PORTVERSION= 11.10.0 CATEGORIES= devel MASTER_SITES= \ https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \ @@ -27,9 +26,11 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ USE_GITLAB= yes +# Find tags here: +# https://gitlab.com/gitlab-org/gitlab-runner/tags GL_ACCOUNT= gitlab-org -GL_COMMIT= 8bb608ff3a677132022502b07dae8a3ea679f3d1 -GITBRANCH= 11-7-stable +GL_COMMIT= 3001a600b2465b6ce803841a84a5a3cac0aadad2 +GITBRANCH= 11-10-stable BUILT= 2019-01-15T15:24:23+0000 GO_LDFLAGS= -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \ diff --git a/devel/gitlab-runner/distinfo b/devel/gitlab-runner/distinfo index 49e51db002b..78c4ef1dfd3 100644 --- a/devel/gitlab-runner/distinfo +++ b/devel/gitlab-runner/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1548607774 +TIMESTAMP = 1555827554 SHA256 (gitlab-runner/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e SIZE (gitlab-runner/prebuilt-x86_64.tar.xz) = 9594352 SHA256 (gitlab-runner/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32 SIZE (gitlab-runner/prebuilt-arm.tar.xz) = 9020896 -SHA256 (gitlab-runner/gitlab-org-gitlab-runner-8bb608ff3a677132022502b07dae8a3ea679f3d1_GL0.tar.gz) = 5bbee4fb83c65f1615fa4acc2acde5897c9ae8d7bb65d58a6d77db211bcf572b -SIZE (gitlab-runner/gitlab-org-gitlab-runner-8bb608ff3a677132022502b07dae8a3ea679f3d1_GL0.tar.gz) = 25783583 +SHA256 (gitlab-runner/gitlab-org-gitlab-runner-3001a600b2465b6ce803841a84a5a3cac0aadad2_GL0.tar.gz) = a5aa71d5930528ac54c4bd44ff16985157270845f4b57376bd8e885d7ec6c986 +SIZE (gitlab-runner/gitlab-org-gitlab-runner-3001a600b2465b6ce803841a84a5a3cac0aadad2_GL0.tar.gz) = 27078224 diff --git a/devel/gitlab-runner/files/patch-mknod.go b/devel/gitlab-runner/files/patch-mknod.go deleted file mode 100644 index e88ce563079..00000000000 --- a/devel/gitlab-runner/files/patch-mknod.go +++ /dev/null @@ -1,11 +0,0 @@ ---- src/github.com/docker/docker/pkg/system/mknod.go.orig 2019-03-01 15:22:53 UTC -+++ src/github.com/docker/docker/pkg/system/mknod.go -@@ -9,7 +9,7 @@ import ( - // Mknod creates a filesystem node (file, device special file or named pipe) named path - // with attributes specified by mode and dev. - func Mknod(path string, mode uint32, dev int) error { -- return syscall.Mknod(path, mode, dev) -+ return syscall.Mknod(path, mode, uint64(dev)) - } - - // Mkdev is used to build the value of linux devices (in /dev/) which specifies major diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 2566012bdf3..88fa33f20ba 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 8.7.1 +PORTVERSION= 9.0.0 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= 6109b64ed81f80e90bf094ad1f1ded8f5e5f8324 +GL_COMMIT= ffe54c21ffc42c03bfbca0dd21e23ae956517c2c USERS= git GROUPS= git diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 1505e5d62b0..b472aa212ef 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553171073 -SHA256 (gitlab-org-gitlab-shell-6109b64ed81f80e90bf094ad1f1ded8f5e5f8324_GL0.tar.gz) = d013d35555f8dd004926366f6b9d66b46cce2e5ca3c89c9448d07903cb9a345b -SIZE (gitlab-org-gitlab-shell-6109b64ed81f80e90bf094ad1f1ded8f5e5f8324_GL0.tar.gz) = 2197505 +TIMESTAMP = 1555692196 +SHA256 (gitlab-org-gitlab-shell-ffe54c21ffc42c03bfbca0dd21e23ae956517c2c_GL0.tar.gz) = eadcca3192a783a5d66b51c0541ecd81b23e5e4a16bf96a934f99b5ca7541a52 +SIZE (gitlab-org-gitlab-shell-ffe54c21ffc42c03bfbca0dd21e23ae956517c2c_GL0.tar.gz) = 2200758 diff --git a/devel/gitlab-shell/files/patch-config.yml.example b/devel/gitlab-shell/files/patch-config.yml.example index f42ab719e37..f7d0a8d5f05 100644 --- a/devel/gitlab-shell/files/patch-config.yml.example +++ b/devel/gitlab-shell/files/patch-config.yml.example @@ -5,7 +5,7 @@ # File used as authorized_keys for gitlab user -auth_file: "/home/git/.ssh/authorized_keys" -+auth_file: "/usr/home/git/.ssh/authorized_keys" ++auth_file: "/usr/local/git/.ssh/authorized_keys" # File that contains the secret key for verifying access to GitLab. # Default is .gitlab_shell_secret in the gitlab-shell directory. diff --git a/devel/gitlab-shell/pkg-plist b/devel/gitlab-shell/pkg-plist index 16e698daf8e..5232ef6f3cb 100644 --- a/devel/gitlab-shell/pkg-plist +++ b/devel/gitlab-shell/pkg-plist @@ -30,10 +30,9 @@ @(,,555) %%DATADIR%%/hooks/update %%DATADIR%%/lib/action.rb %%DATADIR%%/lib/action/custom.rb -%%DATADIR%%/lib/gitlab_access.rb +%%DATADIR%%/lib/console_helper.rb %%DATADIR%%/lib/gitlab_access_status.rb %%DATADIR%%/lib/gitlab_config.rb -%%DATADIR%%/lib/gitlab_custom_hook.rb %%DATADIR%%/lib/gitlab_init.rb %%DATADIR%%/lib/gitlab_keys.rb %%DATADIR%%/lib/gitlab_lfs_authentication.rb @@ -41,29 +40,28 @@ %%DATADIR%%/lib/gitlab_metrics.rb %%DATADIR%%/lib/gitlab_net.rb %%DATADIR%%/lib/gitlab_net/errors.rb -%%DATADIR%%/lib/gitlab_post_receive.rb %%DATADIR%%/lib/gitlab_shell.rb %%DATADIR%%/lib/hooks_utils.rb %%DATADIR%%/lib/httpunix.rb %%DATADIR%%/lib/http_helper.rb %%DATADIR%%/lib/object_dirs_helper.rb %%DATADIR%%/spec/action/custom_spec.rb -%%DATADIR%%/spec/gitlab_access_spec.rb +%%DATADIR%%/spec/console_helper_spec.rb %%DATADIR%%/spec/gitlab_config_spec.rb -%%DATADIR%%/spec/gitlab_custom_hook_spec.rb %%DATADIR%%/spec/gitlab_keys_spec.rb %%DATADIR%%/spec/gitlab_lfs_authentication_spec.rb %%DATADIR%%/spec/gitlab_logger_spec.rb %%DATADIR%%/spec/gitlab_metrics_spec.rb %%DATADIR%%/spec/gitlab_net_spec.rb -%%DATADIR%%/spec/gitlab_post_receive_spec.rb %%DATADIR%%/spec/gitlab_shell_authorized_keys_check_spec.rb %%DATADIR%%/spec/gitlab_shell_gitlab_shell_spec.rb %%DATADIR%%/spec/gitlab_shell_spec.rb +%%DATADIR%%/spec/gitlab_shell_two_factor_recovery_spec.rb %%DATADIR%%/spec/hooks_utils_spec.rb %%DATADIR%%/spec/httpunix_spec.rb %%DATADIR%%/spec/object_dirs_helper_spec.rb %%DATADIR%%/spec/spec_helper.rb +%%DATADIR%%/spec/support/gitlab_shell_setup.rb %%DATADIR%%/spec/support/gl_id_test_hook %%DATADIR%%/spec/support/http_unix_server.rb %%DATADIR%%/support/go-update-vendor diff --git a/devel/grumpy/Makefile b/devel/grumpy/Makefile index bba06d564d9..8a28e456850 100644 --- a/devel/grumpy/Makefile +++ b/devel/grumpy/Makefile @@ -7,6 +7,8 @@ CATEGORIES= devel MAINTAINER= swills@FreeBSD.org COMMENT= Python to Go source code transcompiler and runtime +BROKEN_i386= constant 2147762812 overflows int + BUILD_DEPENDS= go:lang/go RUN_DEPENDS:= ${BUILD_DEPENDS} diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile index 6aa1ef553c8..7b8aebd5187 100644 --- a/devel/include-what-you-use/Makefile +++ b/devel/include-what-you-use/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= include-what-you-use -PORTVERSION= 0.10 +PORTVERSION= 0.12 CATEGORIES= devel MAINTAINER= koobs@FreeBSD.org @@ -11,8 +11,8 @@ COMMENT= Tool for use with clang to analyze #includes in C and C++ source files LICENSE= NCSA LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -BUILD_DEPENDS= clang60:devel/llvm60 -RUN_DEPENDS= clang60:devel/llvm60 +BUILD_DEPENDS= clang80:devel/llvm80 +RUN_DEPENDS= clang80:devel/llvm80 USES= cmake compiler:c++11-lang ncurses python:run shebangfix USE_GITHUB= yes @@ -20,9 +20,9 @@ USE_GITHUB= yes SHEBANG_FILES= fix_includes.py \ iwyu_tool.py -GH_TAGNAME= clang_6.0 +GH_TAGNAME= clang_8.0 -CMAKE_ARGS+= -DIWYU_LLVM_INCLUDE_PATH=${LOCALBASE}/llvm60/include \ - -DIWYU_LLVM_LIB_PATH=${LOCALBASE}/llvm60/lib +CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm80/lib/cmake/llvm \ + -DClang_DIR=${LOCALBASE}/llvm80/lib/cmake/clang .include diff --git a/devel/include-what-you-use/distinfo b/devel/include-what-you-use/distinfo index f8b689f144a..13d2527b6b9 100644 --- a/devel/include-what-you-use/distinfo +++ b/devel/include-what-you-use/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533500686 -SHA256 (include-what-you-use-include-what-you-use-0.10-clang_6.0_GH0.tar.gz) = 720275b2742462004c8b2b2317571569cec8d084f6e8eda745c99043b63d7175 -SIZE (include-what-you-use-include-what-you-use-0.10-clang_6.0_GH0.tar.gz) = 440406 +TIMESTAMP = 1556011804 +SHA256 (include-what-you-use-include-what-you-use-0.12-clang_8.0_GH0.tar.gz) = 2df080a3e657ebf40386c94a327d1aeeb9ff8d4569bfb860df398629b7f0fdb6 +SIZE (include-what-you-use-include-what-you-use-0.12-clang_8.0_GH0.tar.gz) = 545788 diff --git a/devel/include-what-you-use/pkg-descr b/devel/include-what-you-use/pkg-descr index cb8f20d8a87..44a7cd378ca 100644 --- a/devel/include-what-you-use/pkg-descr +++ b/devel/include-what-you-use/pkg-descr @@ -12,4 +12,4 @@ without fear of accidentally breaking the upwards dependencies of that file. It also becomes easy to automatically track and update dependencies in the source code. -WWW: http://include-what-you-use.org +WWW: https://include-what-you-use.org diff --git a/devel/include-what-you-use/pkg-plist b/devel/include-what-you-use/pkg-plist index 783755351af..543823b3610 100644 --- a/devel/include-what-you-use/pkg-plist +++ b/devel/include-what-you-use/pkg-plist @@ -1,8 +1,12 @@ bin/fix_includes.py bin/include-what-you-use bin/iwyu_tool.py +%%DATADIR%%/boost-1.64-all-private.imp +%%DATADIR%%/boost-1.64-all.imp %%DATADIR%%/boost-all-private.imp %%DATADIR%%/boost-all.imp +%%DATADIR%%/clang-6.intrinsics.imp +%%DATADIR%%/gcc-8.intrinsics.imp %%DATADIR%%/gcc.libc.imp %%DATADIR%%/gcc.stl.headers.imp %%DATADIR%%/gcc.symbols.imp @@ -11,4 +15,3 @@ bin/iwyu_tool.py %%DATADIR%%/qt4.imp %%DATADIR%%/qt5_4.imp %%DATADIR%%/stl.c.headers.imp -%%DATADIR%%/third_party.imp diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile index 0a1ed9a800d..8eed5a41ca6 100644 --- a/devel/ipython/Makefile +++ b/devel/ipython/Makefile @@ -3,6 +3,7 @@ PORTNAME= ipython PORTVERSION= 7.2.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit2>=2.0.0:devel/py-prompt_toolkit2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=2.0.0:devel/py-prompt_toolkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR} \ diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile index 95585526cf1..0eced20458a 100644 --- a/devel/ispc/Makefile +++ b/devel/ispc/Makefile @@ -3,8 +3,7 @@ PORTNAME= ispc DISTVERSIONPREFIX= v -DISTVERSION= 1.10.0 -PORTREVISION= 2 +DISTVERSION= 1.11.0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -18,29 +17,19 @@ ONLY_FOR_ARCHS_REASON= only available for x86 architectures LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} -USES= bison gmake python:build shebangfix +USES= bison cmake python:build shebangfix USE_GITHUB= yes - -ALL_TARGET= default -MAKE_ENV= LLVM_HOME="${LOCALBASE}" SHEBANG_FILES= *.py -MAKE_ARGS= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \ - CLANG=clang${LLVM_DEFAULT} CXX=clang++${LLVM_DEFAULT} +CONFIGURE_ENV= PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin:${PATH} +CMAKE_OFF= ISPC_INCLUDE_EXAMPLES -PLIST_FILES= bin/ispc +BINARY_ALIAS= python=${PYTHON_CMD} -post-patch: - @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}| ; s|@$$(C|$$(C|' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e '/alloca\.h/d' ${WRKSRC}/src/util.cpp - @${REINPLACE_CMD} -e '/^LLVM_LIBS=/s|$$| -lexecinfo|' \ - ${WRKSRC}/Makefile +PLIST_FILES= bin/ispc \ + bin/check_isa -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ispc ${STAGEDIR}${PREFIX}/bin - -do-test: +do-test: # tests are broken with python-3.6 @cd ${WRKSRC} && ISPC_HOME=${WRKSRC} ./run_tests.py run-examples: diff --git a/devel/ispc/distinfo b/devel/ispc/distinfo index cb3b771fe57..e8ade9c2ddd 100644 --- a/devel/ispc/distinfo +++ b/devel/ispc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548912339 -SHA256 (ispc-ispc-v1.10.0_GH0.tar.gz) = 0aa30e989f8d446b2680c9078d5c5db70634f40b9aa07db387aa35aa08dd0b81 -SIZE (ispc-ispc-v1.10.0_GH0.tar.gz) = 19358558 +TIMESTAMP = 1555776188 +SHA256 (ispc-ispc-v1.11.0_GH0.tar.gz) = f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f +SIZE (ispc-ispc-v1.11.0_GH0.tar.gz) = 19369955 diff --git a/devel/ispc/files/patch-Makefile b/devel/ispc/files/patch-Makefile deleted file mode 100644 index b8cd1e1819e..00000000000 --- a/devel/ispc/files/patch-Makefile +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2019-01-19 01:23:04 UTC -+++ Makefile -@@ -113,7 +113,7 @@ endif - ifneq ($(NVPTX_ENABLED), 0) - LLVM_COMPONENTS+=nvptx - endif --LLVM_LIBS=$(shell $(LLVM_CONFIG) --libs $(LLVM_COMPONENTS)) -+LLVM_LIBS=$(shell $(LLVM_CONFIG) --libs $(LLVM_COMPONENTS)) -lexecinfo - - CLANG=clang - CLANG_LIBS = -lclangFrontend -lclangDriver \ -@@ -249,16 +249,16 @@ dirs: - @/bin/mkdir -p objs - - llvm_check: -- @llvm-config --version > /dev/null || \ -+ @$(LLVM_CONFIG) --version > /dev/null || \ - (echo; \ - echo "******************************************"; \ -- echo "ERROR: llvm-config not found in your PATH"; \ -+ echo "ERROR: $(LLVM_CONFIG) not found in your PATH"; \ - echo "******************************************"; \ - echo; exit 1) - @echo -e '$(subst $(newline), ,$(RIGHT_LLVM))' - - print_llvm_src: llvm_check -- @echo Using LLVM `llvm-config --version` from `llvm-config --libdir` -+ @echo Using LLVM `$(LLVM_CONFIG) --version` from `$(LLVM_CONFIG) --libdir` - @echo Using compiler to build: `$(CXX) --version | head -1` - - clean: diff --git a/devel/ispc/files/patch-examples_common.mk b/devel/ispc/files/patch-examples_common.mk deleted file mode 100644 index d3b78321fcd..00000000000 --- a/devel/ispc/files/patch-examples_common.mk +++ /dev/null @@ -1,39 +0,0 @@ ---- examples/common.mk.orig 2016-07-08 11:13:52 UTC -+++ examples/common.mk -@@ -4,18 +4,18 @@ TASK_LIB=-lpthread - TASK_OBJ=objs/tasksys.o - - CXX=clang++ --CXXFLAGS+=-Iobjs/ -O2 -+CXXFLAGS+=-Iobjs/ -O2 -std=c++11 -I$(LOCALBASE)/include - CC=clang - CCFLAGS+=-Iobjs/ -O2 - --LIBS=-lm $(TASK_LIB) -lstdc++ -+LIBS=-lm $(TASK_LIB) -lstdc++ -L$(LOCALBASE)/lib -ltbb - ISPC=ispc - ISPC_FLAGS+=-O2 - ISPC_HEADER=objs/$(ISPC_SRC:.ispc=_ispc.h) - --ARCH:=$(shell uname -m | sed -e s/x86_64/x86/ -e s/i686/x86/ -e s/arm.*/arm/ -e s/sa110/arm/) -+_ARCH:=$(shell uname -m | sed -e s/amd64/x86/ -e s/i.86/x86/ -e s/arm.*/arm/ -e s/sa110/arm/) - --ifeq ($(ARCH),x86) -+ifeq ($(_ARCH),x86) - ISPC_OBJS=$(addprefix objs/, $(ISPC_SRC:.ispc=)_ispc.o) - COMMA=, - ifneq (,$(findstring $(COMMA),$(ISPC_IA_TARGETS))) -@@ -53,11 +53,11 @@ ifeq ($(ARCH),x86) - CXXFLAGS += -m64 - CCFLAGS += -m64 - endif --else ifeq ($(ARCH),arm) -+else ifeq ($(_ARCH),arm) - ISPC_OBJS=$(addprefix objs/, $(ISPC_SRC:.ispc=_ispc.o)) - ISPC_TARGETS=$(ISPC_ARM_TARGETS) - else -- $(error Unknown architecture $(ARCH) from uname -m) -+ $(error Unknown architecture $(_ARCH) from uname -m) - endif - - CPP_OBJS=$(addprefix objs/, $(CPP_SRC:.cpp=.o)) diff --git a/devel/ispc/files/patch-examples_tasksys.cpp b/devel/ispc/files/patch-examples_tasksys.cpp index 1c88aa73eda..2653ed00254 100644 --- a/devel/ispc/files/patch-examples_tasksys.cpp +++ b/devel/ispc/files/patch-examples_tasksys.cpp @@ -1,11 +1,20 @@ ---- examples/tasksys.cpp.orig 2016-07-08 11:13:52 UTC +--- examples/tasksys.cpp.orig 2019-04-20 16:09:47 UTC +++ examples/tasksys.cpp -@@ -90,6 +90,8 @@ - #define ISPC_USE_CONCRT - #elif defined(__linux__) - #define ISPC_USE_PTHREADS -+ #elif defined(__FreeBSD__) -+ #define ISPC_USE_TBB_TASK_GROUP // ISPC_USE_PTHREADS fails for some reason, need to investigate - #elif defined(__APPLE__) - #define ISPC_USE_GCD - #endif +@@ -88,6 +88,8 @@ + #define ISPC_USE_CONCRT + #elif defined(__linux__) + #define ISPC_USE_PTHREADS ++#elif defined(__FreeBSD__) ++#define ISPC_USE_TBB_TASK_GROUP // ISPC_USE_PTHREADS fails for some reason, need to investigate + #elif defined(__APPLE__) + #define ISPC_USE_GCD + #endif +@@ -101,6 +103,8 @@ + #define ISPC_IS_WINDOWS + #elif defined(__linux__) + #define ISPC_IS_LINUX ++#elif defined(__FreeBSD__) ++#define ISPC_IS_FREEBSD + #elif defined(__APPLE__) + #define ISPC_IS_APPLE + #endif diff --git a/devel/ispc/files/patch-src_ispc.h b/devel/ispc/files/patch-src_ispc.h new file mode 100644 index 00000000000..c13f6df3de5 --- /dev/null +++ b/devel/ispc/files/patch-src_ispc.h @@ -0,0 +1,11 @@ +--- src/ispc.h.orig 2019-04-20 16:38:55 UTC ++++ src/ispc.h +@@ -48,6 +48,8 @@ + #define ISPC_IS_WINDOWS + #elif defined(__linux__) + #define ISPC_IS_LINUX ++#elif defined(__FreeBSD__) ++#define ISPC_IS_FREEBSD + #elif defined(__APPLE__) + #define ISPC_IS_APPLE + #endif diff --git a/devel/ispc/files/patch-src_llvmutil.cpp b/devel/ispc/files/patch-src_llvmutil.cpp index d63f0ad53e5..4d6cd929cad 100644 --- a/devel/ispc/files/patch-src_llvmutil.cpp +++ b/devel/ispc/files/patch-src_llvmutil.cpp @@ -1,8 +1,9 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug functionality, and it isn't available in the LLVM packages. --- src/llvmutil.cpp.orig 2019-03-02 06:20:14 UTC +--- src/llvmutil.cpp.orig 2019-04-20 16:08:37 UTC +++ src/llvmutil.cpp -@@ -1550,7 +1550,7 @@ lDumpValue(llvm::Value *v, std::setdebugPrint) { printf("*** Code going into optimization ***\n"); - module->dump(); + //module->dump(); } + #endif DebugPassManager optPM; - optPM.add(llvm::createVerifierPass(),0); -@@ -932,7 +932,7 @@ Optimize(llvm::Module *module, int optLe - +@@ -892,7 +892,7 @@ void Optimize(llvm::Module *module, int + #ifndef ISPC_NO_DUMPS if (g->debugPrint) { printf("\n*****\nFINAL OUTPUT\n*****\n"); - module->dump(); + //module->dump(); } - + #endif } -@@ -4895,7 +4895,7 @@ bool - DebugPass::runOnModule(llvm::Module &module) { +@@ -1944,11 +1944,11 @@ lExtractUniformsFromOffset(llvm::Value * + llvm::Value *offsetScale, + llvm::Instruction *insertBefore) { + #if 1 +- (*basePtr)->dump(); ++ //(*basePtr)->dump(); + printf("\n"); +- (*offsetVector)->dump(); ++ //(*offsetVector)->dump(); + printf("\n"); +- offsetScale->dump(); ++ //offsetScale->dump(); + printf("-----\n"); + #endif + +@@ -4394,7 +4394,7 @@ char DebugPass::ID = 0; + bool DebugPass::runOnModule(llvm::Module &module) { fprintf(stderr, "%s", str_output); fflush(stderr); - module.dump(); diff --git a/devel/ispc/files/patch-src_util.cpp b/devel/ispc/files/patch-src_util.cpp new file mode 100644 index 00000000000..d66390c655f --- /dev/null +++ b/devel/ispc/files/patch-src_util.cpp @@ -0,0 +1,12 @@ +--- src/util.cpp.orig 2019-04-20 16:26:13 UTC ++++ src/util.cpp +@@ -43,7 +43,9 @@ + #include // for alloca() + #endif + #else ++#if !defined(ISPC_IS_FREEBSD) + #include ++#endif + #include + #endif + #include diff --git a/devel/libepoll-shim/Makefile b/devel/libepoll-shim/Makefile index a6294b99b34..d93c08012b1 100644 --- a/devel/libepoll-shim/Makefile +++ b/devel/libepoll-shim/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libepoll-shim -PORTVERSION= 0.0.20181229 +PORTVERSION= 0.0.20190311 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org @@ -13,17 +13,17 @@ LICENSE= MIT USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= epoll-shim -GH_TAGNAME= 212c17b +GH_TAGNAME= 1d1135384395dbf38eea00680ca28ead04f8dce2 USE_LDCONFIG= yes USES= compiler uidfix -MAKE_ARGS= INCSDIR=${PREFIX}/include/libepoll-shim/sys \ - LIBDIR=${PREFIX}/lib WITHOUT_PROFILE=yes +MAKE_ARGS= WITHOUT_PROFILE=yes .include post-patch: + @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile .if "${CHOSEN_COMPILER_TYPE}" == "gcc" @${REINPLACE_CMD} -e 's|Wno-missing-variable-declarations|Wno-missing-declarations|' \ -e 's|-Wno-thread-safety-analysis||' ${WRKSRC}/Makefile diff --git a/devel/libepoll-shim/distinfo b/devel/libepoll-shim/distinfo index 67ec24f86f8..37fed620fc4 100644 --- a/devel/libepoll-shim/distinfo +++ b/devel/libepoll-shim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546110650 -SHA256 (FreeBSDDesktop-epoll-shim-0.0.20181229-212c17b_GH0.tar.gz) = 819ec3de3ab233487d5be5fe506b23b81c05ee5daf5db1440ede76231615a86a -SIZE (FreeBSDDesktop-epoll-shim-0.0.20181229-212c17b_GH0.tar.gz) = 15833 +TIMESTAMP = 1554794906 +SHA256 (FreeBSDDesktop-epoll-shim-0.0.20190311-1d1135384395dbf38eea00680ca28ead04f8dce2_GH0.tar.gz) = 689aaf4a6f8f14a715986f03c283cbabf404a2ac5370ad6430f28cc8e101b554 +SIZE (FreeBSDDesktop-epoll-shim-0.0.20190311-1d1135384395dbf38eea00680ca28ead04f8dce2_GH0.tar.gz) = 16341 diff --git a/devel/libepoll-shim/pkg-plist b/devel/libepoll-shim/pkg-plist index 286712623c6..13394d67718 100644 --- a/devel/libepoll-shim/pkg-plist +++ b/devel/libepoll-shim/pkg-plist @@ -4,3 +4,4 @@ include/libepoll-shim/sys/timerfd.h lib/libepoll-shim.a lib/libepoll-shim.so lib/libepoll-shim.so.0 +libdata/pkgconfig/epoll-shim.pc diff --git a/devel/libffcall/Makefile b/devel/libffcall/Makefile index a897b23d07d..c49b5f0bee5 100644 --- a/devel/libffcall/Makefile +++ b/devel/libffcall/Makefile @@ -12,7 +12,6 @@ COMMENT= Foreign function call libraries LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= fails to build: checking whether code in malloc()ed memory is executable... Killing runaway build after 14400 seconds with no output BROKEN_armv6= fails to build: avcall-armhf.s:46:2: error: '.syntax divided' arm assembly not supported BROKEN_armv7= fails to build: avcall-armhf.s:46:2: error: '.syntax divided' arm assembly not supported BROKEN_mips= fails to build: gmake[2]: No rule to make target 'avcall-mipsn32-macro.S', needed by 'avcall-mipsn32.s' diff --git a/devel/libmaa/Makefile b/devel/libmaa/Makefile index c8c0de230db..16e57a39d3e 100644 --- a/devel/libmaa/Makefile +++ b/devel/libmaa/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libmaa -PORTVERSION= 1.4.3 +PORTVERSION= 1.4.4 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/libmaa/distinfo b/devel/libmaa/distinfo index e012ff8549e..9bc7fd807ef 100644 --- a/devel/libmaa/distinfo +++ b/devel/libmaa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550365183 -SHA256 (cheusov-libmaa-1.4.3_GH0.tar.gz) = 6e577ea641bf4007f9f060fc5c912b002ab31b235f852ee390e458b87b5cd394 -SIZE (cheusov-libmaa-1.4.3_GH0.tar.gz) = 175161 +TIMESTAMP = 1556118464 +SHA256 (cheusov-libmaa-1.4.4_GH0.tar.gz) = 6d65f63d6eb633f2a20993f6b58db0fdcd3b70c5749ed1105aed55ca953119fa +SIZE (cheusov-libmaa-1.4.4_GH0.tar.gz) = 175202 diff --git a/devel/p5-Alien-Build/Makefile b/devel/p5-Alien-Build/Makefile index 1750ada1c52..c29666d8f4c 100644 --- a/devel/p5-Alien-Build/Makefile +++ b/devel/p5-Alien-Build/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Alien-Build -PORTVERSION= 1.65 +PORTVERSION= 1.68 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Alien-Build/distinfo b/devel/p5-Alien-Build/distinfo index ca30a109a58..b7857642653 100644 --- a/devel/p5-Alien-Build/distinfo +++ b/devel/p5-Alien-Build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555111281 -SHA256 (Alien-Build-1.65.tar.gz) = 8ad4ffdf237b5e6d7e2f70e83bad2972eae13d5ab87d44fba5912b25b2817cf7 -SIZE (Alien-Build-1.65.tar.gz) = 242826 +TIMESTAMP = 1556118495 +SHA256 (Alien-Build-1.68.tar.gz) = c854c901e0b12c1f3ab7826db14108ba9698efed4df2c2d3155b0230dfc3465a +SIZE (Alien-Build-1.68.tar.gz) = 260463 diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile index a9ca2d59a17..4b25caa1a3b 100644 --- a/devel/p5-Date-Manip/Makefile +++ b/devel/p5-Date-Manip/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Date-Manip -PORTVERSION= 6.75 +PORTVERSION= 6.76 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SBECK diff --git a/devel/p5-Date-Manip/distinfo b/devel/p5-Date-Manip/distinfo index fd36661363d..090911f1a38 100644 --- a/devel/p5-Date-Manip/distinfo +++ b/devel/p5-Date-Manip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543875843 -SHA256 (Date-Manip-6.75.tar.gz) = c1fbcfbe2ab1a84e57f191807e87c97985da00926f64d1aae598c8756acbb67d -SIZE (Date-Manip-6.75.tar.gz) = 1849350 +TIMESTAMP = 1556052688 +SHA256 (Date-Manip-6.76.tar.gz) = 1c87c78c03e3479e3b695952c0a5c11d3593ca9a5340dfb14d0be3d3e7ad63a8 +SIZE (Date-Manip-6.76.tar.gz) = 2020952 diff --git a/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist index 859d19acda9..d824861ccb6 100644 --- a/devel/p5-Date-Manip/pkg-plist +++ b/devel/p5-Date-Manip/pkg-plist @@ -549,6 +549,11 @@ bin/dm_zdump %%SITE_PERL%%/Date/Manip/Offset/off437.pm %%SITE_PERL%%/Date/Manip/Offset/off438.pm %%SITE_PERL%%/Date/Manip/Offset/off439.pm +%%SITE_PERL%%/Date/Manip/Offset/off440.pm +%%SITE_PERL%%/Date/Manip/Offset/off441.pm +%%SITE_PERL%%/Date/Manip/Offset/off442.pm +%%SITE_PERL%%/Date/Manip/Offset/off443.pm +%%SITE_PERL%%/Date/Manip/Offset/off444.pm %%SITE_PERL%%/Date/Manip/Problems.pod %%SITE_PERL%%/Date/Manip/Recur.pm %%SITE_PERL%%/Date/Manip/Recur.pod @@ -770,6 +775,7 @@ bin/dm_zdump %%SITE_PERL%%/Date/Manip/TZ/aspont00.pm %%SITE_PERL%%/Date/Manip/TZ/aspyon00.pm %%SITE_PERL%%/Date/Manip/TZ/asqata00.pm +%%SITE_PERL%%/Date/Manip/TZ/asqost00.pm %%SITE_PERL%%/Date/Manip/TZ/asqyzy00.pm %%SITE_PERL%%/Date/Manip/TZ/asriya00.pm %%SITE_PERL%%/Date/Manip/TZ/assakh00.pm diff --git a/devel/p5-FFI-Platypus/Makefile b/devel/p5-FFI-Platypus/Makefile index c01890d2089..88baf8d0646 100644 --- a/devel/p5-FFI-Platypus/Makefile +++ b/devel/p5-FFI-Platypus/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= FFI-Platypus -PORTVERSION= 0.86 +PORTVERSION= 0.87 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-FFI-Platypus/distinfo b/devel/p5-FFI-Platypus/distinfo index 7e9f316673b..bd5b4ed6d3e 100644 --- a/devel/p5-FFI-Platypus/distinfo +++ b/devel/p5-FFI-Platypus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551632280 -SHA256 (FFI-Platypus-0.86.tar.gz) = 7ab95c86c3a23bf213f19cf2977033ecb61b819bdade60beb8660cd0d41dd0a0 -SIZE (FFI-Platypus-0.86.tar.gz) = 241072 +TIMESTAMP = 1556118470 +SHA256 (FFI-Platypus-0.87.tar.gz) = 2ee823d9e2fcb9b30cbb1716c19b15bf9e1e8618d65ebb2b2747cc973b0128b9 +SIZE (FFI-Platypus-0.87.tar.gz) = 251625 diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile index 4fe9bd83f32..9d9aa412a9e 100644 --- a/devel/p5-Glib2/Makefile +++ b/devel/p5-Glib2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Glib -PORTVERSION= 1.328 +PORTVERSION= 1.329 CATEGORIES= devel perl5 MASTER_SITES= CPAN SF/gtk2-perl/${PORTNAME}/${PORTVERSION} MASTER_SITE_SUBDIR= CPAN:XAOC diff --git a/devel/p5-Glib2/distinfo b/devel/p5-Glib2/distinfo index ddb5dd4bdcb..70eeb807fdd 100644 --- a/devel/p5-Glib2/distinfo +++ b/devel/p5-Glib2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541121247 -SHA256 (Glib-1.328.tar.gz) = 459cc2add7aaa90aa56675582a93989158ed38caa1e10628733ccc690e0464d5 -SIZE (Glib-1.328.tar.gz) = 301694 +TIMESTAMP = 1556053503 +SHA256 (Glib-1.329.tar.gz) = 7b4ce1c8cf884849189efaa0b5722ecfb0d87a15f94fccc6a6017d3b3f982a35 +SIZE (Glib-1.329.tar.gz) = 301794 diff --git a/devel/p5-IO-Prompt-Tiny/Makefile b/devel/p5-IO-Prompt-Tiny/Makefile index 532333f619b..22397379bb2 100644 --- a/devel/p5-IO-Prompt-Tiny/Makefile +++ b/devel/p5-IO-Prompt-Tiny/Makefile @@ -11,6 +11,7 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Prompt for user input with a default option LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= p5-Capture-Tiny>=0.12:devel/p5-Capture-Tiny diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile index e451bdb1cef..80931ebf3ad 100644 --- a/devel/p5-Storable/Makefile +++ b/devel/p5-Storable/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Storable -PORTVERSION= 3.11 +PORTVERSION= 3.15 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Storable/distinfo b/devel/p5-Storable/distinfo index 42a6501e36a..6250d359f74 100644 --- a/devel/p5-Storable/distinfo +++ b/devel/p5-Storable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536761398 -SHA256 (Storable-3.11.tar.gz) = b2dac116d2f5adaf289e9a8a9bbac35cc2c24a9d2221fea9b6578a33b8ec7d28 -SIZE (Storable-3.11.tar.gz) = 201627 +TIMESTAMP = 1556118498 +SHA256 (Storable-3.15.tar.gz) = fc3dad06cb2e6fc86a2f2abc5b5491d9da328ca3e6b6306559c224521db174da +SIZE (Storable-3.15.tar.gz) = 200589 diff --git a/devel/p5-Storable/pkg-plist b/devel/p5-Storable/pkg-plist index 4d521dcdf9f..5e7c2eade80 100644 --- a/devel/p5-Storable/pkg-plist +++ b/devel/p5-Storable/pkg-plist @@ -1,5 +1,3 @@ %%SITE_ARCH%%/Storable.pm -%%SITE_ARCH%%/Storable/Limit.pm %%SITE_ARCH%%/auto/Storable/Storable.so %%PERL5_MAN3%%/Storable.3.gz -%%PERL5_MAN3%%/Storable::Limit.3.gz diff --git a/devel/p5-Test-Timer/Makefile b/devel/p5-Test-Timer/Makefile index 040e1f301bb..f5b9b90a9a9 100644 --- a/devel/p5-Test-Timer/Makefile +++ b/devel/p5-Test-Timer/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Test-Timer -PORTVERSION= 2.09 +PORTVERSION= 2.10 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Test-Timer/distinfo b/devel/p5-Test-Timer/distinfo index 42263547202..023fdc7e959 100644 --- a/devel/p5-Test-Timer/distinfo +++ b/devel/p5-Test-Timer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515786826 -SHA256 (Test-Timer-2.09.tar.gz) = 10f08d92f0dcdc9f41eb9dc9aeed488f74c9527dc14201e5d48246646cb95302 -SIZE (Test-Timer-2.09.tar.gz) = 37225 +TIMESTAMP = 1556053894 +SHA256 (Test-Timer-2.10.tar.gz) = 2a7950cc266b0ee6fde08506ccfed9e300fde4e965f0b443963c47ada037f3aa +SIZE (Test-Timer-2.10.tar.gz) = 46361 diff --git a/devel/pecl-event/Makefile b/devel/pecl-event/Makefile index 82ec64140f5..76e2d403716 100644 --- a/devel/pecl-event/Makefile +++ b/devel/pecl-event/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= event -PORTVERSION= 2.4.3 +PORTVERSION= 2.4.4 CATEGORIES= devel MAINTAINER= joneum@FreeBSD.org diff --git a/devel/pecl-event/distinfo b/devel/pecl-event/distinfo index a267fdc5045..bed5c730ab2 100644 --- a/devel/pecl-event/distinfo +++ b/devel/pecl-event/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544958659 -SHA256 (PECL/event-2.4.3.tgz) = fb15654a5c84b9080ded14d734fee073e0b528d42378dec9af54a222f28465cf -SIZE (PECL/event-2.4.3.tgz) = 139788 +TIMESTAMP = 1556108563 +SHA256 (PECL/event-2.4.4.tgz) = 21e1aabfe58b4618360f1260f9824f6c01ab993c39036aa250c660ef16ba3d29 +SIZE (PECL/event-2.4.4.tgz) = 139986 diff --git a/devel/phpunit8/Makefile b/devel/phpunit8/Makefile index b4fd23fed63..0a85b39e646 100644 --- a/devel/phpunit8/Makefile +++ b/devel/phpunit8/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= phpunit -DISTVERSION= 8.1.2 +DISTVERSION= 8.1.3 CATEGORIES= devel www MASTER_SITES= https://phar.phpunit.de/ PKGNAMESUFFIX= 8${PHP_PKGNAMESUFFIX} diff --git a/devel/phpunit8/distinfo b/devel/phpunit8/distinfo index bd57ab949ee..d0fdae5aada 100644 --- a/devel/phpunit8/distinfo +++ b/devel/phpunit8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555488412 -SHA256 (phpunit-8.1.2.phar) = 09f6df448717f7c7e7566cdea18da29075126b43efc0c97468d9f804d8073afa -SIZE (phpunit-8.1.2.phar) = 2795901 +TIMESTAMP = 1556106129 +SHA256 (phpunit-8.1.3.phar) = 3a28e31d5380da064a4a6a0017b0de14456f9acdb719bbac4606b9f75eadb8b2 +SIZE (phpunit-8.1.3.phar) = 2798151 diff --git a/devel/picojson/Makefile b/devel/picojson/Makefile new file mode 100644 index 00000000000..4635066384a --- /dev/null +++ b/devel/picojson/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= picojson +DISTVERSIONPREFIX= v +DISTVERSION= 1.3.0 +CATEGORIES= devel + +MAINTAINER= james.wright@digital-chaos.com +COMMENT= Header file only JSON parser/serializer in C++ + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_GITHUB= yes +GH_ACCOUNT= kazuho + +NO_ARCH= yes +NO_BUILD= yes +TEST_TARGET= check + +OPTIONS_DEFINE= EXAMPLES +OPTIONS_SUB= yes + +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} + +.include diff --git a/devel/picojson/distinfo b/devel/picojson/distinfo new file mode 100644 index 00000000000..ac23eb0aeef --- /dev/null +++ b/devel/picojson/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1555165118 +SHA256 (kazuho-picojson-v1.3.0_GH0.tar.gz) = 056805ca2691798f5545935a14bb477f2e1d827c9fb862e6e449dbea22801c7d +SIZE (kazuho-picojson-v1.3.0_GH0.tar.gz) = 14695 diff --git a/devel/picojson/pkg-descr b/devel/picojson/pkg-descr new file mode 100644 index 00000000000..f7911d29b0d --- /dev/null +++ b/devel/picojson/pkg-descr @@ -0,0 +1,9 @@ +PicoJSON is a tiny JSON parser / serializer for C++ with the following +properties: + +* Header-file only +* No external dependencies (only uses standard C++ libraries) +* STL-friendly (arrays are represented using std::vector, objects are std::map) +* Provides both pull interface and streaming (event-based) interface + +WWW: https://github.com/kazuho/picojson diff --git a/devel/picojson/pkg-plist b/devel/picojson/pkg-plist new file mode 100644 index 00000000000..7f125b1791f --- /dev/null +++ b/devel/picojson/pkg-plist @@ -0,0 +1,4 @@ +include/picojson.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/github-issues.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iostream.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/streaming.cc diff --git a/devel/py-aioice/Makefile b/devel/py-aioice/Makefile index e3bbbe76a38..714bee4ab1d 100644 --- a/devel/py-aioice/Makefile +++ b/devel/py-aioice/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aioice -PORTVERSION= 0.6.12 +PORTVERSION= 0.6.14 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-aioice/distinfo b/devel/py-aioice/distinfo index dd551791969..0b358954b31 100644 --- a/devel/py-aioice/distinfo +++ b/devel/py-aioice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547520691 -SHA256 (aioice-0.6.12.tar.gz) = 00f6afd92971dabe6312d7240898ee10da131a17a54b795026a467b08c02087f -SIZE (aioice-0.6.12.tar.gz) = 30671 +TIMESTAMP = 1556107109 +SHA256 (aioice-0.6.14.tar.gz) = a307122621908aa6c544fc86b23a50b7e17211ffa1dd4efaf3d137c68532ef97 +SIZE (aioice-0.6.14.tar.gz) = 30831 diff --git a/devel/py-aiorpcX/Makefile b/devel/py-aiorpcX/Makefile index 34bb83ea7bd..ed72bbc7bdf 100644 --- a/devel/py-aiorpcX/Makefile +++ b/devel/py-aiorpcX/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= aiorpcX -PORTVERSION= 0.16.1 +PORTVERSION= 0.17.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-aiorpcX/distinfo b/devel/py-aiorpcX/distinfo index cb6133e206f..7aa15417305 100644 --- a/devel/py-aiorpcX/distinfo +++ b/devel/py-aiorpcX/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555870527 -SHA256 (aiorpcX-0.16.1.tar.gz) = 6df2d3159124d43ab760f6a7f956095f4162466a513f841e646353e39f37b968 -SIZE (aiorpcX-0.16.1.tar.gz) = 25392 +TIMESTAMP = 1556008079 +SHA256 (aiorpcX-0.17.0.tar.gz) = 13ccc8361bc3049d649094b69aead6118f6deb5f1b88ad77211be85c4e2ed792 +SIZE (aiorpcX-0.17.0.tar.gz) = 26346 diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile index 7bde6cb7d60..d29eb051bd7 100644 --- a/devel/py-aiortc/Makefile +++ b/devel/py-aiortc/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aiortc -PORTVERSION= 0.9.18 -PORTREVISION= 1 +PORTVERSION= 0.9.20 CATEGORIES= devel multimedia python www MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-aiortc/distinfo b/devel/py-aiortc/distinfo index 7da558ce0ec..02ebd424d71 100644 --- a/devel/py-aiortc/distinfo +++ b/devel/py-aiortc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547521216 -SHA256 (aiortc-0.9.18.tar.gz) = e0b5d9d7d157822a6a8c07ff8fecd6cac8902629e496eb390bdea06ff7ce696a -SIZE (aiortc-0.9.18.tar.gz) = 1139164 +TIMESTAMP = 1556107289 +SHA256 (aiortc-0.9.20.tar.gz) = cd6f12849f376f651702552f692d4876f0b77c7abb83b7deecc9ef2a47c9c082 +SIZE (aiortc-0.9.20.tar.gz) = 1143404 diff --git a/devel/py-asynctest/Makefile b/devel/py-asynctest/Makefile index 3e93ddcf352..29e34d2db32 100644 --- a/devel/py-asynctest/Makefile +++ b/devel/py-asynctest/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asynctest -PORTVERSION= 0.12.3 +PORTVERSION= 0.12.4 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-asynctest/distinfo b/devel/py-asynctest/distinfo index d0a15ff0378..545ec9ea490 100644 --- a/devel/py-asynctest/distinfo +++ b/devel/py-asynctest/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554485988 -SHA256 (asynctest-0.12.3.tar.gz) = bbeb45bb41344d2cbb814b4c89c04f2c568742352736cabf7af6fcbed06f66cc -SIZE (asynctest-0.12.3.tar.gz) = 42222 +TIMESTAMP = 1556118476 +SHA256 (asynctest-0.12.4.tar.gz) = ade427a711d18016f35fb0c5d412f0ed63fb074a6084b67ff2dad48f50b0d6ca +SIZE (asynctest-0.12.4.tar.gz) = 42747 diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile index fb76d78abd6..418415b0126 100644 --- a/devel/py-check-manifest/Makefile +++ b/devel/py-check-manifest/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= check-manifest -PORTVERSION= 0.37 -PORTREVISION= 1 +PORTVERSION= 0.38 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,12 +13,14 @@ COMMENT= Tool to check the completeness of MANIFEST.in for Python packages LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} OPTIONS_DEFINE= DOCS USES= python USE_PYTHON= autoplist concurrent distutils + NO_ARCH= yes PORTDOCS= CHANGES.rst README.rst diff --git a/devel/py-check-manifest/distinfo b/devel/py-check-manifest/distinfo index 18baa6a4c5d..2b9d496a51e 100644 --- a/devel/py-check-manifest/distinfo +++ b/devel/py-check-manifest/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523619712 -SHA256 (check-manifest-0.37.tar.gz) = 44e3cf4b0833a55460046bf7a3600eaadbcae5e9d13baf0c9d9789dd5c2c6452 -SIZE (check-manifest-0.37.tar.gz) = 33896 +TIMESTAMP = 1556118482 +SHA256 (check-manifest-0.38.tar.gz) = dba4749e3874d8f83eb4f0814c9c331fcade6c6325f885deb7b14aa1487fb323 +SIZE (check-manifest-0.38.tar.gz) = 34779 diff --git a/devel/py-jupyter_console/Makefile b/devel/py-jupyter_console/Makefile index 7ba24303dc2..b9f918c692b 100644 --- a/devel/py-jupyter_console/Makefile +++ b/devel/py-jupyter_console/Makefile @@ -2,6 +2,7 @@ PORTNAME= jupyter_console PORTVERSION= 6.0.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.md RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>=7.0.0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.0.0:devel/py-ipykernel5@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit2>=2.0.0:devel/py-prompt_toolkit2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=2.0.0:devel/py-prompt_toolkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} USES= python:3.5+ diff --git a/devel/py-kaptan/Makefile b/devel/py-kaptan/Makefile index 516382853af..7e547a49d20 100644 --- a/devel/py-kaptan/Makefile +++ b/devel/py-kaptan/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kaptan -PORTVERSION= 0.5.11 -PORTREVISION= 1 +PORTVERSION= 0.5.12 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +13,7 @@ COMMENT= Python config parser for json, yaml LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-kaptan/distinfo b/devel/py-kaptan/distinfo index 44db73f7395..cf0ec538a04 100644 --- a/devel/py-kaptan/distinfo +++ b/devel/py-kaptan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546276707 -SHA256 (kaptan-0.5.11.tar.gz) = 8403d6e48200c3f49cb6d6b3dcb5898aa5ab9d820831655bf9a2403e00cd4207 -SIZE (kaptan-0.5.11.tar.gz) = 10202 +TIMESTAMP = 1556029601 +SHA256 (kaptan-0.5.12.tar.gz) = 1abd1f56731422fce5af1acc28801677a51e56f5d3c3e8636db761ed143c3dd2 +SIZE (kaptan-0.5.12.tar.gz) = 10539 diff --git a/devel/py-progress/Makefile b/devel/py-progress/Makefile new file mode 100644 index 00000000000..9a427fdcbc5 --- /dev/null +++ b/devel/py-progress/Makefile @@ -0,0 +1,19 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= progress +PORTVERSION= 1.5 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Easy to use progress bars + +LICENSE= ISCL +#LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= python +USE_PYTHON= autoplist concurrent distutils + +.include diff --git a/devel/py-progress/distinfo b/devel/py-progress/distinfo new file mode 100644 index 00000000000..aebfe3ff8ff --- /dev/null +++ b/devel/py-progress/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1556122006 +SHA256 (progress-1.5.tar.gz) = 69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372 +SIZE (progress-1.5.tar.gz) = 5842 diff --git a/devel/py-progress/pkg-descr b/devel/py-progress/pkg-descr new file mode 100644 index 00000000000..f3f600d3b76 --- /dev/null +++ b/devel/py-progress/pkg-descr @@ -0,0 +1,12 @@ +It provides easy to use progress bars for Python. + +There are 7 progress bars to choose from: +- Bar +- ChargingBar +- FillingSquaresBar +- FillingCirclesBar +- IncrementalBar +- PixelBar +- ShadyBar + +WWW: https://github.com/verigak/progress diff --git a/devel/py-prompt_toolkit2/Makefile b/devel/py-prompt_toolkit2/Makefile index c33da7c8368..cfe49400f32 100644 --- a/devel/py-prompt_toolkit2/Makefile +++ b/devel/py-prompt_toolkit2/Makefile @@ -13,6 +13,9 @@ COMMENT= Library for building powerful interactive command lines in Python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +DEPRECATED= No longer required, use devel/py-prompt_toolkit instead +EXPIRATION= 2019-05-24 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR} diff --git a/devel/py-streamparse/Makefile b/devel/py-streamparse/Makefile index 7ac06da967a..e08bb7f4054 100644 --- a/devel/py-streamparse/Makefile +++ b/devel/py-streamparse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= streamparse -PORTVERSION= 3.15.1 +PORTVERSION= 3.16.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-streamparse/distinfo b/devel/py-streamparse/distinfo index bbf20f512bf..2d0767e4faa 100644 --- a/devel/py-streamparse/distinfo +++ b/devel/py-streamparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548839997 -SHA256 (streamparse-3.15.1.tar.gz) = 2ec687138e45d9de42e8e70097876c3839d343c47eff681a0332a58e905ad393 -SIZE (streamparse-3.15.1.tar.gz) = 54528 +TIMESTAMP = 1555512127 +SHA256 (streamparse-3.16.0.tar.gz) = 9ff83c506981fbd0e9a4ca923a9ca1c4bea9ba85da47dd5856970774b30b5a26 +SIZE (streamparse-3.16.0.tar.gz) = 54852 diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index 7d9a0a43858..8fe11906a6c 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ruby-build -PORTVERSION= 20190401 +PORTVERSION= 20190423 DISTVERSIONPREFIX= v CATEGORIES= devel ruby diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index 98d2ae0099e..540e04c11a5 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554247666 -SHA256 (rbenv-ruby-build-v20190401_GH0.tar.gz) = 11017b1132e592efc1a01449a0d90919672778e9c5eaa0c38fd85b2488fca5da -SIZE (rbenv-ruby-build-v20190401_GH0.tar.gz) = 61753 +TIMESTAMP = 1555996930 +SHA256 (rbenv-ruby-build-v20190423_GH0.tar.gz) = 39f3ab0a8c37e2d177504563fc361bfadea73e8f632295228bc132e634b7792c +SIZE (rbenv-ruby-build-v20190423_GH0.tar.gz) = 62153 diff --git a/devel/rubygem-bootstrap_form/Makefile b/devel/rubygem-bootstrap_form/Makefile index 0c33c572bd4..98e30ea7747 100644 --- a/devel/rubygem-bootstrap_form/Makefile +++ b/devel/rubygem-bootstrap_form/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= bootstrap_form -PORTVERSION= 2.7.0 +PORTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -9,10 +10,14 @@ MAINTAINER= mfechner@FreeBSD.org COMMENT= Form builder using Twitter Bootstrap 3+ LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-actionpack50>=5.0:www/rubygem-actionpack50 \ + rubygem-activemodel50>=5.0:databases/rubygem-activemodel50 -NO_ARCH= yes USES= gem USE_RUBY= yes +NO_ARCH= yes + .include diff --git a/devel/rubygem-bootstrap_form/distinfo b/devel/rubygem-bootstrap_form/distinfo index 47b75b9f702..2911c3b32c5 100644 --- a/devel/rubygem-bootstrap_form/distinfo +++ b/devel/rubygem-bootstrap_form/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505729748 -SHA256 (rubygem/bootstrap_form-2.7.0.gem) = dc0549a2e221569a65cc233a2ca0da8bd5d7241a2c52c6dfef882c5de246886b -SIZE (rubygem/bootstrap_form-2.7.0.gem) = 172544 +TIMESTAMP = 1555690498 +SHA256 (rubygem/bootstrap_form-4.2.0.gem) = f578b3c900d2cf15fab641064d357318b29e285bd5fdf090f903727912889710 +SIZE (rubygem/bootstrap_form-4.2.0.gem) = 108544 diff --git a/devel/rubygem-execjs/Makefile b/devel/rubygem-execjs/Makefile index f57f0de12cf..d73a594449f 100644 --- a/devel/rubygem-execjs/Makefile +++ b/devel/rubygem-execjs/Makefile @@ -20,7 +20,7 @@ NO_ARCH= yes OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= NODE NODE6 NODE8 NODE10 OPTIONS_DEFAULT=NODE -NODE_DESC= Use Node.js 11.x (www/node) as backend +NODE_DESC= Use Node.js 11.x/12.x (www/node) as backend NODE6_DESC= Use Node.js 6.x (www/node6) as backend NODE8_DESC= Use Node.js 8.x (www/node8) as backend NODE10_DESC= Use Node.js 10.x (www/node10) as backend diff --git a/devel/rubygem-hashdiff/Makefile b/devel/rubygem-hashdiff/Makefile index 80abad91faa..9b15691f34d 100644 --- a/devel/rubygem-hashdiff/Makefile +++ b/devel/rubygem-hashdiff/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hashdiff -PORTVERSION= 0.3.8 +PORTVERSION= 0.3.9 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-hashdiff/distinfo b/devel/rubygem-hashdiff/distinfo index e8b26b3d005..812b3093937 100644 --- a/devel/rubygem-hashdiff/distinfo +++ b/devel/rubygem-hashdiff/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546453270 -SHA256 (rubygem/hashdiff-0.3.8.gem) = 532b5ad492806b7bb64152f62cec3bfa7fd06753e16c1fa045e9a0ae6e79d3a7 -SIZE (rubygem/hashdiff-0.3.8.gem) = 18944 +TIMESTAMP = 1556029617 +SHA256 (rubygem/hashdiff-0.3.9.gem) = 9d788399acc8e0a9937c9647f1c099f1c44e42e92718cd3f486c44eb542251e2 +SIZE (rubygem/hashdiff-0.3.9.gem) = 18944 diff --git a/devel/rubygem-puppet-resource_api/Makefile b/devel/rubygem-puppet-resource_api/Makefile new file mode 100644 index 00000000000..7d36b837b12 --- /dev/null +++ b/devel/rubygem-puppet-resource_api/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= puppet-resource_api +PORTVERSION= 1.8.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= puppet@FreeBSD.org +COMMENT= Simple way to write new native resources for puppet + +LICENSE= APACHE20 + +RUN_DEPENDS= rubygem-hocon>=1.0:devel/rubygem-hocon + +USES= gem +USE_RUBY= yes + +.include diff --git a/devel/rubygem-puppet-resource_api/distinfo b/devel/rubygem-puppet-resource_api/distinfo new file mode 100644 index 00000000000..f74354b28eb --- /dev/null +++ b/devel/rubygem-puppet-resource_api/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1552679696 +SHA256 (rubygem/puppet-resource_api-1.8.1.gem) = dadb5cf1439f42700a9922b206753fb8939067bb7b7b0caee2c67c760bd91feb +SIZE (rubygem/puppet-resource_api-1.8.1.gem) = 43520 diff --git a/devel/rubygem-puppet-resource_api/pkg-descr b/devel/rubygem-puppet-resource_api/pkg-descr new file mode 100644 index 00000000000..3c867dde557 --- /dev/null +++ b/devel/rubygem-puppet-resource_api/pkg-descr @@ -0,0 +1,4 @@ +This is an implementation of the Resource API specification. It provides a +simple way to write new native resources for Puppet. + +WWW: https://github.com/puppetlabs/puppet-resource_api diff --git a/devel/rubygem-recaptcha3/Makefile b/devel/rubygem-recaptcha3/Makefile deleted file mode 100644 index 0807ca9c453..00000000000 --- a/devel/rubygem-recaptcha3/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $FreeBSD$ - -PORTNAME= recaptcha -PORTVERSION= 3.4.0 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 3 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Helpers for the reCAPTCHA API - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= rubygem-json>=0:devel/rubygem-json - -PORTSCOUT= limit:^3\. - -NO_ARCH= yes -USES= gem -USE_RUBY= yes - -.include diff --git a/devel/rubygem-recaptcha3/distinfo b/devel/rubygem-recaptcha3/distinfo deleted file mode 100644 index 58a0a8347df..00000000000 --- a/devel/rubygem-recaptcha3/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1517647852 -SHA256 (rubygem/recaptcha-3.4.0.gem) = 7f3719544c44ef61552dd392555dd1342c893dd85c0a7a20bd62bce2b174563e -SIZE (rubygem/recaptcha-3.4.0.gem) = 11776 diff --git a/devel/rubygem-recaptcha3/pkg-descr b/devel/rubygem-recaptcha3/pkg-descr deleted file mode 100644 index 346123266de..00000000000 --- a/devel/rubygem-recaptcha3/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This plugin adds helpers for the reCAPTCHA API - -WWW: https://github.com/ambethia/recaptcha diff --git a/devel/rubygem-sentry-raven/Makefile b/devel/rubygem-sentry-raven/Makefile index dcb35f091d7..58447c4d11c 100644 --- a/devel/rubygem-sentry-raven/Makefile +++ b/devel/rubygem-sentry-raven/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sentry-raven -PORTVERSION= 2.7.4 +PORTVERSION= 2.9.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,9 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-faraday>=0.7.6:www/rubygem-faraday -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes PLIST_FILES= bin/raven diff --git a/devel/rubygem-sentry-raven/distinfo b/devel/rubygem-sentry-raven/distinfo index 7ec9df6f9bc..c552654b7d8 100644 --- a/devel/rubygem-sentry-raven/distinfo +++ b/devel/rubygem-sentry-raven/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532975751 -SHA256 (rubygem/sentry-raven-2.7.4.gem) = c49115bf8b067e12fafa42215ca9c7040f013a935eb68036bec7575546640b50 -SIZE (rubygem/sentry-raven-2.7.4.gem) = 60416 +TIMESTAMP = 1555691445 +SHA256 (rubygem/sentry-raven-2.9.0.gem) = 0391b345f9eafffea9db36dec8b58af66bffb36c7fd6fdaa063e13f1e2e239c9 +SIZE (rubygem/sentry-raven-2.9.0.gem) = 46080 diff --git a/devel/rubygem-tty/Makefile b/devel/rubygem-tty/Makefile index fc571b752a4..780123857b0 100644 --- a/devel/rubygem-tty/Makefile +++ b/devel/rubygem-tty/Makefile @@ -3,7 +3,7 @@ PORTNAME= tty PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-tty/files/patch-gemspec b/devel/rubygem-tty/files/patch-gemspec index f2197927cad..fe326e70025 100644 --- a/devel/rubygem-tty/files/patch-gemspec +++ b/devel/rubygem-tty/files/patch-gemspec @@ -1,4 +1,4 @@ ---- tty.gemspec.orig 2019-03-31 07:37:18 UTC +--- tty.gemspec.orig 2019-04-23 14:13:24 UTC +++ tty.gemspec @@ -31,10 +31,10 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q.freeze, ["~> 0.6"]) @@ -14,3 +14,12 @@ s.add_runtime_dependency(%q.freeze, ["~> 0.2.0"]) s.add_runtime_dependency(%q.freeze, ["~> 0.16.0"]) s.add_runtime_dependency(%q.freeze, ["~> 0.18.0"]) +@@ -46,7 +46,7 @@ Gem::Specification.new do |s| + s.add_runtime_dependency(%q.freeze, ["~> 0.5"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.7.2"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.20.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.16", "< 2.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 1.16"]) + s.add_development_dependency(%q.freeze, ["~> 3.0"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + else diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 67551f56ab4..12d3b4c4794 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -21,12 +21,8 @@ USES= alias cmake compiler:c++11-lib cpe gl jpeg openal:al,alut \ USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut -LDFLAGS_mips= -losgDB -LDFLAGS_mips64= -losgDB -LDFLAGS_powerpc64= -losgDB -LDFLAGS_powerpc= -losgDB -LDFLAGS_powerpcspe= -losgDB -LDFLAGS_sparc64= -losgDB +LDFLAGS_gcc= -losgDB +LDFLAGS+= ${LDFLAGS_${CHOSEN_COMPILER_TYPE}} post-patch: # Avoid conflict with C++20 by adding .txt suffix diff --git a/devel/simgear/files/patch-simgear_nasal_cppbind_NasalHash.hxx b/devel/simgear/files/patch-simgear_nasal_cppbind_NasalHash.hxx new file mode 100644 index 00000000000..effe59395b4 --- /dev/null +++ b/devel/simgear/files/patch-simgear_nasal_cppbind_NasalHash.hxx @@ -0,0 +1,10 @@ +--- simgear/nasal/cppbind/NasalHash.hxx.orig 2019-04-23 16:24:11 UTC ++++ simgear/nasal/cppbind/NasalHash.hxx +@@ -23,6 +23,7 @@ + #include "to_nasal.hxx" + + #include ++#include + #include + + namespace nasal diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile index 41b17954ea4..74f100c6bad 100644 --- a/devel/thrift-cpp/Makefile +++ b/devel/thrift-cpp/Makefile @@ -13,6 +13,8 @@ DISTNAME= thrift-${PORTVERSION} MAINTAINER= komarov@valerka.net COMMENT= C++ interface to Thrift +BROKEN_i386= undefined reference to 'boost::atomics::detail::lockpool::scoped_lock::scoped_lock(void const volatile*)' + LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libevent.so:devel/libevent diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist index ec0078fe072..819c5262228 100644 --- a/dns/bind-tools/pkg-plist +++ b/dns/bind-tools/pkg-plist @@ -6,7 +6,6 @@ bin/mdig bin/named-rrchecker bin/nslookup bin/nsupdate -@comment lib/named/filter-aaaa.so man/man1/arpaname.1.gz man/man1/delv.1.gz man/man1/dig.1.gz @@ -27,7 +26,6 @@ man/man8/dnssec-revoke.8.gz man/man8/dnssec-settime.8.gz man/man8/dnssec-signzone.8.gz man/man8/dnssec-verify.8.gz -@comment man/man8/filter-aaaa.8.gz man/man8/named-journalprint.8.gz man/man8/nsec3hash.8.gz sbin/dnssec-cds diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index e78c1c9732a..1f027bb8e8c 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -9,7 +9,7 @@ PORTREVISION= 0 .else # XXX: correct version # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 # XXX: put the ISC master_site @@ -34,17 +34,20 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 +.if !defined(BIND_TOOLS_SLAVE) +RUN_DEPENDS= bind-tools>0:dns/bind-tools +.endif # XXX: remove tar:bz2 USES= compiler:c11 cpe libedit ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.15.0a0.2019.04.12 +ISCVERSION= 9.15.0a0.2019.04.23 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= d134dd9c8ca970a64ad2c469eff1c9e228b25e4e +GL_COMMIT= fd7f2c8f9dbfd0a10690044683398778a2359e83 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -66,26 +69,29 @@ CONFLICTS= bind911 bind912 bind913 bind914 .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared -# XXX: Change to the correct version -CONFLICTS+= bind9-devel +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools .else +CONFIGURE_ARGS+= --without-python USE_RC_SUBR= named SUB_FILES= pkg-message named.conf -CONFLICTS+= bind-tools +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON -OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ +OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON +OPTIONS_DEFINE= IDN LARGE_FILE JSON \ FIXED_RRSET SIGCHASE OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 -.if !defined(BIND_TOOLS_SLAVE) +.if defined(BIND_TOOLS_SLAVE) +OPTIONS_DEFINE+= PYTHON +OPTIONS_DEFAULT+= PYTHON +.else OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB TCP_FASTOPEN OPTIONS_DEFINE+= DOCS \ OVERRIDECACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ @@ -225,24 +231,13 @@ post-extract: post-patch: @${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${GL_COMMIT}#' \ ${WRKSRC}/version -.if defined(BIND_TOOLS_SLAVE) - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ - -e 's#isc-config.sh installdirs#installdirs#' \ - -e 's#.*INSTALL.*isc-config.*##' \ - -e 's#.*INSTALL.*bind.keys.*##' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ - -e 's#^ .*check confgen ##' \ - ${WRKSRC}/bin/Makefile.in -.else -. for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ +.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} -. endfor -.endif +.endfor .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} @@ -273,10 +268,11 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.endif # BIND_TOOLS_SLAVE +.else # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} +.endif # BIND_TOOLS_SLAVE .include diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index e159d2a82ce..48796bbf2aa 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555328595 -SHA256 (isc-projects-bind9-d134dd9c8ca970a64ad2c469eff1c9e228b25e4e_GL0.tar.gz) = bac546edb7246bd9e36b4c869851c82cd95bcfcfaa30fc7f32bec07058cf2a9c -SIZE (isc-projects-bind9-d134dd9c8ca970a64ad2c469eff1c9e228b25e4e_GL0.tar.gz) = 6343158 +TIMESTAMP = 1556019631 +SHA256 (isc-projects-bind9-fd7f2c8f9dbfd0a10690044683398778a2359e83_GL0.tar.gz) = faec8f7c1a6f2317f89469a87ce095a7d610ba31bb8b23284caa463a237b63a0 +SIZE (isc-projects-bind9-fd7f2c8f9dbfd0a10690044683398778a2359e83_GL0.tar.gz) = 6342894 diff --git a/dns/bind9-devel/files/extrapatch-bind-tools b/dns/bind9-devel/files/extrapatch-bind-tools new file mode 100644 index 00000000000..a62fab8ace2 --- /dev/null +++ b/dns/bind9-devel/files/extrapatch-bind-tools @@ -0,0 +1,41 @@ +Only select the "tools" part of bind for building. + +--- Makefile.in.orig 2019-03-20 05:57:56 UTC ++++ Makefile.in +@@ -14,7 +14,7 @@ top_builddir = @top_builddir@ + + VERSION=@BIND9_VERSION@ + +-SUBDIRS = make lib fuzz bin doc ++SUBDIRS = lib bin + TARGETS = + PREREQS = bind.keys.h + +@@ -54,14 +54,11 @@ installdirs: + ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 + +-install:: isc-config.sh installdirs +- ${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir} ++install:: installdirs + rm -f ${DESTDIR}${bindir}/bind9-config + @LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config +- ${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1 + rm -f ${DESTDIR}${mandir}/man1/bind9-config.1 + @LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1 +- ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir} + + uninstall:: + rm -f ${DESTDIR}${sysconfdir}/bind.keys +--- bin/Makefile.in.orig 2019-03-20 05:57:56 UTC ++++ bin/Makefile.in +@@ -11,7 +11,7 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ +- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests ++SUBDIRS = dig delv dnssec tools nsupdate \ ++ @NZD_TOOLS@ @PYTHON_TOOLS@ + TARGETS = + diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools new file mode 100644 index 00000000000..5c7e85f8cd4 --- /dev/null +++ b/dns/bind9-devel/files/extrapatch-no-bind-tools @@ -0,0 +1,51 @@ +Exclude the "tools" from building and installing. + +--- bin/Makefile.in.orig 2019-03-20 05:57:56 UTC ++++ bin/Makefile.in +@@ -11,8 +11,8 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ +- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests ++SUBDIRS = named rndc tools check confgen \ ++ @NZD_TOOLS@ @PKCS11_TOOLS@ plugins tests + TARGETS = + + @BIND9_MAKE_RULES@ +--- bin/tools/Makefile.in.orig 2019-04-15 14:30:39 UTC ++++ bin/tools/Makefile.in +@@ -39,10 +39,7 @@ SUBDIRS = + + DNSTAPTARGETS = dnstap-read@EXEEXT@ + NZDTARGETS = named-nzd2nzf@EXEEXT@ +-TARGETS = arpaname@EXEEXT@ named-journalprint@EXEEXT@ \ +- named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \ +- mdig@EXEEXT@ \ +- @DNSTAPTARGETS@ @NZDTARGETS@ ++TARGETS = @DNSTAPTARGETS@ @NZDTARGETS@ + + DNSTAPSRCS = dnstap-read.c + NZDSRCS = named-nzd2nzf.c +@@ -118,21 +115,6 @@ dnstap: + ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1 + + install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1 + + uninstall:: + rm -f ${DESTDIR}${mandir}/man1/mdig.1 diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure index 573d4d7ac48..7867e73c94e 100644 --- a/dns/bind9-devel/files/patch-configure +++ b/dns/bind9-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2019-04-12 04:28:06 UTC +--- configure.orig 2019-04-23 04:29:30 UTC +++ configure -@@ -16605,27 +16605,9 @@ done +@@ -16596,27 +16596,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -16668,47 +16650,7 @@ $as_echo "no" >&6; } ;; +@@ -16659,47 +16641,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -21194,7 +21136,7 @@ $as_echo "" >&6; } +@@ -21185,7 +21127,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 45bc62392a1..62d74c06f79 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -1,14 +1,6 @@ -bin/arpaname bin/bind9-config -bin/delv -bin/dig %%DNSTAP%%bin/dnstap-read -bin/host bin/isc-config.sh -bin/mdig -bin/named-rrchecker -bin/nslookup -bin/nsupdate @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys @@ -277,40 +269,18 @@ lib/libisccc.a lib/libisccfg.a lib/libns.a lib/named/filter-aaaa.so -man/man1/arpaname.1.gz man/man1/bind9-config.1.gz -man/man1/delv.1.gz -man/man1/dig.1.gz %%DNSTAP%%man/man1/dnstap-read.1.gz -man/man1/host.1.gz man/man1/isc-config.sh.1.gz -man/man1/mdig.1.gz -man/man1/named-rrchecker.1.gz -man/man1/nslookup.1.gz -man/man1/nsupdate.1.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz -man/man8/dnssec-cds.8.gz -%%PYTHON%%man/man8/dnssec-checkds.8.gz -%%PYTHON%%man/man8/dnssec-coverage.8.gz -man/man8/dnssec-dsfromkey.8.gz -man/man8/dnssec-importkey.8.gz -man/man8/dnssec-keyfromlabel.8.gz -man/man8/dnssec-keygen.8.gz -%%PYTHON%%man/man8/dnssec-keymgr.8.gz -man/man8/dnssec-revoke.8.gz -man/man8/dnssec-settime.8.gz -man/man8/dnssec-signzone.8.gz -man/man8/dnssec-verify.8.gz man/man8/filter-aaaa.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz -man/man8/named-journalprint.8.gz %%LMDB%%man/man8/named-nzd2nzf.8.gz man/man8/named.8.gz -man/man8/nsec3hash.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz @@ -319,25 +289,11 @@ man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz man/man8/tsig-keygen.8.gz sbin/ddns-confgen -sbin/dnssec-cds -%%PYTHON%%sbin/dnssec-checkds -%%PYTHON%%sbin/dnssec-coverage -sbin/dnssec-dsfromkey -sbin/dnssec-importkey -sbin/dnssec-keyfromlabel -sbin/dnssec-keygen -%%PYTHON%%sbin/dnssec-keymgr -sbin/dnssec-revoke -sbin/dnssec-settime -sbin/dnssec-signzone -sbin/dnssec-verify sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone -sbin/named-journalprint %%LMDB%%sbin/named-nzd2nzf -sbin/nsec3hash %%NATIVE_PKCS11%%sbin/pkcs11-destroy %%NATIVE_PKCS11%%sbin/pkcs11-keygen %%NATIVE_PKCS11%%sbin/pkcs11-list diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile index 289561e564f..41e07ef7529 100644 --- a/dns/bind911/Makefile +++ b/dns/bind911/Makefile @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 911 @@ -16,6 +16,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 +RUN_DEPENDS= bind-tools>0:dns/bind-tools USE_HARDENING= safestack @@ -37,10 +38,11 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --with-gost=no \ + --without-python \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind-tools bind912 bind913 bind914 bind9-devel +CONFLICTS= bind912 bind913 bind914 bind9-devel SUB_FILES= pkg-message named.conf USE_RC_SUBR= named @@ -49,10 +51,10 @@ MAKE_JOBS_UNSAFE= yes PORTDOCS= * -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON \ +OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \ DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN \ FILTER_AAAA -OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ +OPTIONS_DEFINE= IDN LARGE_FILE JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \ RPZ_NSIP RPZ_NSDNAME DOCS \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ @@ -89,7 +91,6 @@ LMDB_DESC= Use LMDB for zone management MINCACHE_DESC= Use the mincachettl patch NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) PORTREVISION_DESC= Show PORTREVISION in the version string -PYTHON_DESC= Build with Python utilities QUERYTRACE_DESC= Enable the very verbose query tracelogging RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules @@ -159,11 +160,6 @@ MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 NATIVE_PKCS11_IMPLIES= THREADS -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} -PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} -PYTHON_USES= python - QUERYTRACE_CONFIGURE_ENABLE= querytrace RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname @@ -253,8 +249,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/CHANGES \ ${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR} -# Can't use USE_PYTHON=autoplist -post-install-PYTHON-on: - @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} - .include diff --git a/dns/bind911/files/patch-no-bind-tools b/dns/bind911/files/patch-no-bind-tools new file mode 100644 index 00000000000..795d3e9e756 --- /dev/null +++ b/dns/bind911/files/patch-no-bind-tools @@ -0,0 +1,55 @@ +Exclude the "tools" from building and installing. + +--- bin/Makefile.in.orig 2019-02-27 23:28:15 UTC ++++ bin/Makefile.in +@@ -11,7 +11,7 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ ++SUBDIRS = named rndc tools check confgen \ + @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests + TARGETS = + +--- bin/tools/Makefile.in.orig 2019-02-27 23:28:15 UTC ++++ bin/tools/Makefile.in +@@ -42,10 +42,7 @@ SUBDIRS = + + DNSTAPTARGETS = dnstap-read@EXEEXT@ + NZDTARGETS = named-nzd2nzf@EXEEXT@ +-TARGETS = arpaname@EXEEXT@ named-journalprint@EXEEXT@ \ +- named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \ +- genrandom@EXEEXT@ isc-hmac-fixup@EXEEXT@ mdig@EXEEXT@ \ +- @DNSTAPTARGETS@ @NZDTARGETS@ ++TARGETS = @DNSTAPTARGETS@ @NZDTARGETS@ + + DNSTAPSRCS = dnstap-read.c + NZDSRCS = named-nzd2nzf.c +@@ -130,27 +127,6 @@ dnstap: + ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1 + + install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} genrandom@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} isc-hmac-fixup@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/isc-hmac-fixup.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1 + + uninstall:: + rm -f ${DESTDIR}${mandir}/man1/mdig.1 diff --git a/dns/bind911/pkg-plist b/dns/bind911/pkg-plist index 9e34eb5b04e..9aba0a15652 100644 --- a/dns/bind911/pkg-plist +++ b/dns/bind911/pkg-plist @@ -1,14 +1,6 @@ -bin/arpaname bin/bind9-config -bin/delv -bin/dig %%DNSTAP%%bin/dnstap-read -bin/host bin/isc-config.sh -bin/mdig -bin/named-rrchecker -bin/nslookup -bin/nsupdate @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys @@ -284,17 +276,9 @@ lib/libisc.a lib/libisccc.a lib/libisccfg.a lib/liblwres.a -man/man1/arpaname.1.gz man/man1/bind9-config.1.gz -man/man1/delv.1.gz -man/man1/dig.1.gz %%DNSTAP%%man/man1/dnstap-read.1.gz -man/man1/host.1.gz man/man1/isc-config.sh.1.gz -man/man1/mdig.1.gz -man/man1/named-rrchecker.1.gz -man/man1/nslookup.1.gz -man/man1/nsupdate.1.gz man/man3/lwres.3.gz man/man3/lwres_addr_parse.3.gz man/man3/lwres_buffer.3.gz @@ -383,27 +367,12 @@ man/man3/lwres_string_parse.3.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz -%%PYTHON%%man/man8/dnssec-checkds.8.gz -%%PYTHON%%man/man8/dnssec-coverage.8.gz -man/man8/dnssec-dsfromkey.8.gz -man/man8/dnssec-importkey.8.gz -man/man8/dnssec-keyfromlabel.8.gz -man/man8/dnssec-keygen.8.gz -%%PYTHON%%man/man8/dnssec-keymgr.8.gz -man/man8/dnssec-revoke.8.gz -man/man8/dnssec-settime.8.gz -man/man8/dnssec-signzone.8.gz -man/man8/dnssec-verify.8.gz -man/man8/genrandom.8.gz -man/man8/isc-hmac-fixup.8.gz man/man8/lwresd.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz -man/man8/named-journalprint.8.gz %%LMDB%%man/man8/named-nzd2nzf.8.gz man/man8/named.8.gz -man/man8/nsec3hash.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz @@ -412,27 +381,12 @@ man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz man/man8/tsig-keygen.8.gz sbin/ddns-confgen -%%PYTHON%%sbin/dnssec-checkds -%%PYTHON%%sbin/dnssec-coverage -sbin/dnssec-dsfromkey -sbin/dnssec-importkey -sbin/dnssec-keyfromlabel -sbin/dnssec-keygen -%%PYTHON%%sbin/dnssec-keymgr -sbin/dnssec-revoke -sbin/dnssec-settime -sbin/dnssec-signzone -sbin/dnssec-verify -sbin/genrandom -sbin/isc-hmac-fixup sbin/lwresd sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone -sbin/named-journalprint %%LMDB%%sbin/named-nzd2nzf -sbin/nsec3hash %%NATIVE_PKCS11%%sbin/pkcs11-destroy %%NATIVE_PKCS11%%sbin/pkcs11-keygen %%NATIVE_PKCS11%%sbin/pkcs11-list diff --git a/dns/bind913/Makefile b/dns/bind913/Makefile index 91d8d300129..1e482a6e5c3 100644 --- a/dns/bind913/Makefile +++ b/dns/bind913/Makefile @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} PORTREVISION= 0 .else # dns/bind913 here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -30,6 +30,9 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 +.if !defined(BIND_TOOLS_SLAVE) +RUN_DEPENDS= bind-tools>0:dns/bind-tools +.endif USE_HARDENING= safestack @@ -56,25 +59,29 @@ CONFLICTS= bind911 bind912 bind914 bind9-devel .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared -CONFLICTS+= bind913 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools .else +CONFIGURE_ARGS+= --without-python USE_RC_SUBR= named SUB_FILES= pkg-message named.conf -CONFLICTS+= bind-tools +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON -OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ +OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON +OPTIONS_DEFINE= IDN LARGE_FILE JSON \ FIXED_RRSET SIGCHASE OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 -.if !defined(BIND_TOOLS_SLAVE) +.if defined(BIND_TOOLS_SLAVE) +OPTIONS_DEFINE+= PYTHON +OPTIONS_DEFAULT+= PYTHON +.else OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB TCP_FASTOPEN OPTIONS_DEFINE+= DOCS \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ @@ -207,24 +214,13 @@ SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines .endif post-patch: -.if defined(BIND_TOOLS_SLAVE) - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ - -e 's#isc-config.sh installdirs#installdirs#' \ - -e 's#.*INSTALL.*isc-config.*##' \ - -e 's#.*INSTALL.*bind.keys.*##' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ - -e 's#^ .*check confgen ##' \ - ${WRKSRC}/bin/Makefile.in -.else -. for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ +.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} -. endfor -.endif +.endfor .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} @@ -255,10 +251,11 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.endif # BIND_TOOLS_SLAVE +.else # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} +.endif # BIND_TOOLS_SLAVE .include diff --git a/dns/bind913/files/extrapatch-bind-tools b/dns/bind913/files/extrapatch-bind-tools new file mode 100644 index 00000000000..185e1556c1e --- /dev/null +++ b/dns/bind913/files/extrapatch-bind-tools @@ -0,0 +1,40 @@ +--- Makefile.in.orig 2019-02-21 02:11:26 UTC ++++ Makefile.in +@@ -14,7 +14,7 @@ top_builddir = @top_builddir@ + + VERSION=@BIND9_VERSION@ + +-SUBDIRS = make lib fuzz bin doc ++SUBDIRS = lib bin + TARGETS = + PREREQS = bind.keys.h + +@@ -54,14 +54,11 @@ installdirs: + ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 + +-install:: isc-config.sh installdirs +- ${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir} ++install:: installdirs + rm -f ${DESTDIR}${bindir}/bind9-config + @LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config +- ${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1 + rm -f ${DESTDIR}${mandir}/man1/bind9-config.1 + @LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1 +- ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir} + + uninstall:: + rm -f ${DESTDIR}${sysconfdir}/bind.keys +--- bin/Makefile.in.orig 2019-02-21 02:11:26 UTC ++++ bin/Makefile.in +@@ -11,8 +11,8 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ +- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests ++SUBDIRS = dig delv dnssec tools nsupdate \ ++ @NZD_TOOLS@ @PYTHON_TOOLS@ + TARGETS = + + @BIND9_MAKE_RULES@ diff --git a/dns/bind913/files/extrapatch-no-bind-tools b/dns/bind913/files/extrapatch-no-bind-tools new file mode 100644 index 00000000000..f9f29d2cafd --- /dev/null +++ b/dns/bind913/files/extrapatch-no-bind-tools @@ -0,0 +1,49 @@ +--- bin/Makefile.in.orig 2019-02-21 02:11:26 UTC ++++ bin/Makefile.in +@@ -11,8 +11,8 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ +- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests ++SUBDIRS = named rndc tools check confgen \ ++ @NZD_TOOLS@ @PKCS11_TOOLS@ plugins tests + TARGETS = + + @BIND9_MAKE_RULES@ +--- bin/tools/Makefile.in.orig 2019-02-21 02:11:26 UTC ++++ bin/tools/Makefile.in +@@ -39,10 +39,7 @@ SUBDIRS = + + DNSTAPTARGETS = dnstap-read@EXEEXT@ + NZDTARGETS = named-nzd2nzf@EXEEXT@ +-TARGETS = arpaname@EXEEXT@ named-journalprint@EXEEXT@ \ +- named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \ +- mdig@EXEEXT@ \ +- @DNSTAPTARGETS@ @NZDTARGETS@ ++TARGETS = @DNSTAPTARGETS@ @NZDTARGETS@ + + DNSTAPSRCS = dnstap-read.c + NZDSRCS = named-nzd2nzf.c +@@ -118,21 +115,6 @@ dnstap: + ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1 + + install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1 + + uninstall:: + rm -f ${DESTDIR}${mandir}/man1/mdig.1 diff --git a/dns/bind913/pkg-plist b/dns/bind913/pkg-plist index b9699d58e37..3ff23642534 100644 --- a/dns/bind913/pkg-plist +++ b/dns/bind913/pkg-plist @@ -1,14 +1,6 @@ -bin/arpaname bin/bind9-config -bin/delv -bin/dig %%DNSTAP%%bin/dnstap-read -bin/host bin/isc-config.sh -bin/mdig -bin/named-rrchecker -bin/nslookup -bin/nsupdate @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys @@ -278,40 +270,18 @@ lib/libisc.a lib/libisccc.a lib/libisccfg.a lib/libns.a -man/man1/arpaname.1.gz man/man1/bind9-config.1.gz -man/man1/delv.1.gz -man/man1/dig.1.gz %%DNSTAP%%man/man1/dnstap-read.1.gz -man/man1/host.1.gz man/man1/isc-config.sh.1.gz -man/man1/mdig.1.gz -man/man1/named-rrchecker.1.gz -man/man1/nslookup.1.gz -man/man1/nsupdate.1.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz -man/man8/dnssec-cds.8.gz -%%PYTHON%%man/man8/dnssec-checkds.8.gz -%%PYTHON%%man/man8/dnssec-coverage.8.gz -man/man8/dnssec-dsfromkey.8.gz -man/man8/dnssec-importkey.8.gz -man/man8/dnssec-keyfromlabel.8.gz -man/man8/dnssec-keygen.8.gz -%%PYTHON%%man/man8/dnssec-keymgr.8.gz -man/man8/dnssec-revoke.8.gz -man/man8/dnssec-settime.8.gz -man/man8/dnssec-signzone.8.gz -man/man8/dnssec-verify.8.gz man/man8/filter-aaaa.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz -man/man8/named-journalprint.8.gz %%LMDB%%man/man8/named-nzd2nzf.8.gz man/man8/named.8.gz -man/man8/nsec3hash.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz @@ -320,25 +290,11 @@ man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz man/man8/tsig-keygen.8.gz sbin/ddns-confgen -sbin/dnssec-cds -%%PYTHON%%sbin/dnssec-checkds -%%PYTHON%%sbin/dnssec-coverage -sbin/dnssec-dsfromkey -sbin/dnssec-importkey -sbin/dnssec-keyfromlabel -sbin/dnssec-keygen -%%PYTHON%%sbin/dnssec-keymgr -sbin/dnssec-revoke -sbin/dnssec-settime -sbin/dnssec-signzone -sbin/dnssec-verify sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone -sbin/named-journalprint %%LMDB%%sbin/named-nzd2nzf -sbin/nsec3hash %%NATIVE_PKCS11%%sbin/pkcs11-destroy %%NATIVE_PKCS11%%sbin/pkcs11-keygen %%NATIVE_PKCS11%%sbin/pkcs11-list diff --git a/dns/bind914/Makefile b/dns/bind914/Makefile index 32c563fc8a9..6a3343636fa 100644 --- a/dns/bind914/Makefile +++ b/dns/bind914/Makefile @@ -7,8 +7,8 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} # dns/bind-tools here PORTREVISION= 0 .else -# dns/bind913 here -PORTREVISION= 0 +# dns/bind914 here +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -30,6 +30,9 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 +.if !defined(BIND_TOOLS_SLAVE) +RUN_DEPENDS= bind-tools>0:dns/bind-tools +.endif USES= compiler:c11 cpe libedit ssl # ISC releases things like 9.8.0-P1, which our versioning doesn't like @@ -54,25 +57,29 @@ CONFLICTS= bind911 bind912 bind13 bind9-devel .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared -CONFLICTS+= bind914 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools .else +CONFIGURE_ARGS+= --without-python USE_RC_SUBR= named SUB_FILES= pkg-message named.conf -CONFLICTS+= bind-tools +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON -OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ +OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON +OPTIONS_DEFINE= IDN LARGE_FILE JSON \ FIXED_RRSET SIGCHASE OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 -.if !defined(BIND_TOOLS_SLAVE) +.if defined(BIND_TOOLS_SLAVE) +OPTIONS_DEFINE+= PYTHON +OPTIONS_DEFAULT+= PYTHON +.else OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB TCP_FASTOPEN OPTIONS_DEFINE+= DOCS \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ @@ -205,24 +212,13 @@ SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines .endif post-patch: -.if defined(BIND_TOOLS_SLAVE) - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ - -e 's#isc-config.sh installdirs#installdirs#' \ - -e 's#.*INSTALL.*isc-config.*##' \ - -e 's#.*INSTALL.*bind.keys.*##' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ - -e 's#^ .*check confgen ##' \ - ${WRKSRC}/bin/Makefile.in -.else -. for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ +.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} -. endfor -.endif +.endfor .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} @@ -253,10 +249,11 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.endif # BIND_TOOLS_SLAVE +.else # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} +.endif # BIND_TOOLS_SLAVE .include diff --git a/dns/bind914/files/extrapatch-bind-tools b/dns/bind914/files/extrapatch-bind-tools new file mode 100644 index 00000000000..a62fab8ace2 --- /dev/null +++ b/dns/bind914/files/extrapatch-bind-tools @@ -0,0 +1,41 @@ +Only select the "tools" part of bind for building. + +--- Makefile.in.orig 2019-03-20 05:57:56 UTC ++++ Makefile.in +@@ -14,7 +14,7 @@ top_builddir = @top_builddir@ + + VERSION=@BIND9_VERSION@ + +-SUBDIRS = make lib fuzz bin doc ++SUBDIRS = lib bin + TARGETS = + PREREQS = bind.keys.h + +@@ -54,14 +54,11 @@ installdirs: + ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 + +-install:: isc-config.sh installdirs +- ${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir} ++install:: installdirs + rm -f ${DESTDIR}${bindir}/bind9-config + @LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config +- ${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1 + rm -f ${DESTDIR}${mandir}/man1/bind9-config.1 + @LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1 +- ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir} + + uninstall:: + rm -f ${DESTDIR}${sysconfdir}/bind.keys +--- bin/Makefile.in.orig 2019-03-20 05:57:56 UTC ++++ bin/Makefile.in +@@ -11,7 +11,7 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ +- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests ++SUBDIRS = dig delv dnssec tools nsupdate \ ++ @NZD_TOOLS@ @PYTHON_TOOLS@ + TARGETS = + diff --git a/dns/bind914/files/extrapatch-no-bind-tools b/dns/bind914/files/extrapatch-no-bind-tools new file mode 100644 index 00000000000..5c7e85f8cd4 --- /dev/null +++ b/dns/bind914/files/extrapatch-no-bind-tools @@ -0,0 +1,51 @@ +Exclude the "tools" from building and installing. + +--- bin/Makefile.in.orig 2019-03-20 05:57:56 UTC ++++ bin/Makefile.in +@@ -11,8 +11,8 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ +- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests ++SUBDIRS = named rndc tools check confgen \ ++ @NZD_TOOLS@ @PKCS11_TOOLS@ plugins tests + TARGETS = + + @BIND9_MAKE_RULES@ +--- bin/tools/Makefile.in.orig 2019-04-15 14:30:39 UTC ++++ bin/tools/Makefile.in +@@ -39,10 +39,7 @@ SUBDIRS = + + DNSTAPTARGETS = dnstap-read@EXEEXT@ + NZDTARGETS = named-nzd2nzf@EXEEXT@ +-TARGETS = arpaname@EXEEXT@ named-journalprint@EXEEXT@ \ +- named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \ +- mdig@EXEEXT@ \ +- @DNSTAPTARGETS@ @NZDTARGETS@ ++TARGETS = @DNSTAPTARGETS@ @NZDTARGETS@ + + DNSTAPSRCS = dnstap-read.c + NZDSRCS = named-nzd2nzf.c +@@ -118,21 +115,6 @@ dnstap: + ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1 + + install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \ +- ${DESTDIR}${sbindir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \ +- ${DESTDIR}${bindir} +- ${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1 +- ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1 + + uninstall:: + rm -f ${DESTDIR}${mandir}/man1/mdig.1 diff --git a/dns/bind914/pkg-plist b/dns/bind914/pkg-plist index ec879674a53..1dd6639b7b3 100644 --- a/dns/bind914/pkg-plist +++ b/dns/bind914/pkg-plist @@ -1,14 +1,6 @@ -bin/arpaname bin/bind9-config -bin/delv -bin/dig %%DNSTAP%%bin/dnstap-read -bin/host bin/isc-config.sh -bin/mdig -bin/named-rrchecker -bin/nslookup -bin/nsupdate @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys @@ -278,40 +270,18 @@ lib/libisccc.a lib/libisccfg.a lib/libns.a lib/named/filter-aaaa.so -man/man1/arpaname.1.gz man/man1/bind9-config.1.gz -man/man1/delv.1.gz -man/man1/dig.1.gz %%DNSTAP%%man/man1/dnstap-read.1.gz -man/man1/host.1.gz man/man1/isc-config.sh.1.gz -man/man1/mdig.1.gz -man/man1/named-rrchecker.1.gz -man/man1/nslookup.1.gz -man/man1/nsupdate.1.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz -man/man8/dnssec-cds.8.gz -%%PYTHON%%man/man8/dnssec-checkds.8.gz -%%PYTHON%%man/man8/dnssec-coverage.8.gz -man/man8/dnssec-dsfromkey.8.gz -man/man8/dnssec-importkey.8.gz -man/man8/dnssec-keyfromlabel.8.gz -man/man8/dnssec-keygen.8.gz -%%PYTHON%%man/man8/dnssec-keymgr.8.gz -man/man8/dnssec-revoke.8.gz -man/man8/dnssec-settime.8.gz -man/man8/dnssec-signzone.8.gz -man/man8/dnssec-verify.8.gz man/man8/filter-aaaa.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz -man/man8/named-journalprint.8.gz %%LMDB%%man/man8/named-nzd2nzf.8.gz man/man8/named.8.gz -man/man8/nsec3hash.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz @@ -320,25 +290,11 @@ man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz man/man8/tsig-keygen.8.gz sbin/ddns-confgen -sbin/dnssec-cds -%%PYTHON%%sbin/dnssec-checkds -%%PYTHON%%sbin/dnssec-coverage -sbin/dnssec-dsfromkey -sbin/dnssec-importkey -sbin/dnssec-keyfromlabel -sbin/dnssec-keygen -%%PYTHON%%sbin/dnssec-keymgr -sbin/dnssec-revoke -sbin/dnssec-settime -sbin/dnssec-signzone -sbin/dnssec-verify sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone -sbin/named-journalprint %%LMDB%%sbin/named-nzd2nzf -sbin/nsec3hash %%NATIVE_PKCS11%%sbin/pkcs11-destroy %%NATIVE_PKCS11%%sbin/pkcs11-keygen %%NATIVE_PKCS11%%sbin/pkcs11-list diff --git a/dns/zkt/Makefile b/dns/zkt/Makefile index 5f23618afb6..8e8e7df2ba5 100644 --- a/dns/zkt/Makefile +++ b/dns/zkt/Makefile @@ -3,7 +3,7 @@ PORTNAME= zkt DISTVERSION= 1.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns MASTER_SITES= http://www.hznet.de/dns/zkt/ @@ -13,7 +13,7 @@ COMMENT= Tool to manage keys and signatures for DNSSEC-zones LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= dnssec-signzone:dns/bind911 +BUILD_DEPENDS= dnssec-signzone:dns/bind-tools RUN_DEPENDS:= ${BUILD_DEPENDS} DIR_NAMED_CONF?= /etc/namedb diff --git a/editors/dte/Makefile b/editors/dte/Makefile index e7a55d474d0..bc91c04b70c 100644 --- a/editors/dte/Makefile +++ b/editors/dte/Makefile @@ -2,7 +2,7 @@ PORTNAME= dte DISTVERSIONPREFIX= v -DISTVERSION= 1.8 +DISTVERSION= 1.8.2 CATEGORIES= editors MAINTAINER= dg@syrec.org diff --git a/editors/dte/distinfo b/editors/dte/distinfo index 3be7586e317..11aa415f703 100644 --- a/editors/dte/distinfo +++ b/editors/dte/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555676844 -SHA256 (craigbarnes-dte-v1.8_GH0.tar.gz) = 49316028e91428d7ee699cc289650dacf12854513544d884fae568a8da957981 -SIZE (craigbarnes-dte-v1.8_GH0.tar.gz) = 260814 +TIMESTAMP = 1556021557 +SHA256 (craigbarnes-dte-v1.8.2_GH0.tar.gz) = 778786c0b2588f0d9a651ebfde939885a5579745dae8f5d9adc480f4895d6c04 +SIZE (craigbarnes-dte-v1.8.2_GH0.tar.gz) = 267142 diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile index f7015a9d881..9a9368c6544 100644 --- a/emulators/gngeo/Makefile +++ b/emulators/gngeo/Makefile @@ -13,6 +13,8 @@ COMMENT= NeoGeo emulator LICENSE= GPLv2 +BROKEN_i386= unknown argument: '-frerun-loop-opt' + USES= autoreconf compiler:features gmake USE_SDL= image sdl USE_GL= yes diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 0a1741d9926..0057dd7a467 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.26 -PORTREVISION= 4 +PORTVERSION= 5.2.28 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo index bb5528d0e78..9f4f82c7743 100644 --- a/emulators/virtualbox-ose-additions/distinfo +++ b/emulators/virtualbox-ose-additions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548732081 -SHA256 (VirtualBox-5.2.26.tar.bz2) = 4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467 -SIZE (VirtualBox-5.2.26.tar.bz2) = 118371765 +TIMESTAMP = 1556040474 +SHA256 (VirtualBox-5.2.28.tar.bz2) = 802fbe9068034112c123cd160e9258e9b52e95b0b853bf6f569e8aa4a15fb94a +SIZE (VirtualBox-5.2.28.tar.bz2) = 118655475 diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 77648487996..911af4903f3 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.26 +PORTVERSION= 5.2.28 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo index bb5528d0e78..9f4f82c7743 100644 --- a/emulators/virtualbox-ose-kmod/distinfo +++ b/emulators/virtualbox-ose-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548732081 -SHA256 (VirtualBox-5.2.26.tar.bz2) = 4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467 -SIZE (VirtualBox-5.2.26.tar.bz2) = 118371765 +TIMESTAMP = 1556040474 +SHA256 (VirtualBox-5.2.28.tar.bz2) = 802fbe9068034112c123cd160e9258e9b52e95b0b853bf6f569e8aa4a15fb94a +SIZE (VirtualBox-5.2.28.tar.bz2) = 118655475 diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 98f4d4a4c61..d4441916ba0 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.26 -PORTREVISION= 4 +PORTVERSION= 5.2.28 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -212,9 +211,9 @@ KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} .if ${COMPILER_VERSION} == 80 # XXX PR236616: Clang 8.0 caused runtime problems. BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} -CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER} -CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER} -VBOX_LLVM_VER?= 60 +CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER} +CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER} +VBOX_LLVM_VER?= 60 .endif PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo index c5c530a2db3..d5d7f887f02 100644 --- a/emulators/virtualbox-ose/distinfo +++ b/emulators/virtualbox-ose/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1548732081 -SHA256 (VirtualBox-5.2.26.tar.bz2) = 4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467 -SIZE (VirtualBox-5.2.26.tar.bz2) = 118371765 -SHA256 (VBoxGuestAdditions_5.2.26.iso) = b927c5d0d4c97a9da2522daad41fe96b616ed06bfb0c883f9c42aad2244f7c38 -SIZE (VBoxGuestAdditions_5.2.26.iso) = 58433536 +TIMESTAMP = 1556040474 +SHA256 (VirtualBox-5.2.28.tar.bz2) = 802fbe9068034112c123cd160e9258e9b52e95b0b853bf6f569e8aa4a15fb94a +SIZE (VirtualBox-5.2.28.tar.bz2) = 118655475 +SHA256 (VBoxGuestAdditions_5.2.28.iso) = 69876a992001ef3d3b9c3f40aa0fb6653e1b6663632576b8d75e86c65eab8d33 +SIZE (VBoxGuestAdditions_5.2.28.iso) = 58568704 diff --git a/emulators/virtualbox-ose/files/patch-Config.kmk b/emulators/virtualbox-ose/files/patch-Config.kmk index 2539bb6aba9..9ce6b8f24f7 100644 --- a/emulators/virtualbox-ose/files/patch-Config.kmk +++ b/emulators/virtualbox-ose/files/patch-Config.kmk @@ -1,4 +1,4 @@ ---- Config.kmk.orig 2019-01-25 18:24:01 UTC +--- Config.kmk.orig 2019-04-12 15:47:38 UTC +++ Config.kmk @@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) # Enable OSS audio support. @@ -57,24 +57,6 @@ VBOX_WITH_DOCS= VBOX_WITH_DOCS_PACKING= endif -@@ -1176,13 +1172,13 @@ ifdef VBOX_OSE - ifn1of ($(KBUILD_TARGET), darwin linux solaris win) - VBOX_WITH_INSTALLER= - endif -+ # Undefine codec libraries which are not needed. -+ VBOX_WITH_LIBOPUS= -+ # Disable video recording (with audio support). -+ VBOX_WITH_AUDIO_VIDEOREC= - if1of ($(KBUILD_TARGET), win) -- # Undefine codec libraries which are not needed. - VBOX_WITH_LIBVPX= -- VBOX_WITH_LIBOPUS= -- # Disable video recording (with audio support). - VBOX_WITH_VIDEOREC= -- VBOX_WITH_AUDIO_VIDEOREC= - endif - # branding - VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html @@ -4556,7 +4552,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \ -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ diff --git a/emulators/virtualbox-ose/files/patch-include_VBox_com_array.h b/emulators/virtualbox-ose/files/patch-include_VBox_com_array.h new file mode 100644 index 00000000000..ad8071687bb --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-include_VBox_com_array.h @@ -0,0 +1,36 @@ +--- include/VBox/com/array.h.orig 2019-04-12 15:47:42 UTC ++++ include/VBox/com/array.h +@@ -168,7 +168,7 @@ + + #include "VBox/com/defs.h" + +-#if RT_GNUC_PREREQ(4, 6) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) ++#if RT_GNUC_PREREQ(4, 6) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) || defined(_LIBCPP_VERSION) + /** @def VBOX_WITH_TYPE_TRAITS + * Type traits are a C++ 11 feature, so not available everywhere (yet). + * Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer. +@@ -940,12 +940,12 @@ class SafeArray : public Traits (public) + */ + T &operator[] (size_t aIdx) + { +- AssertReturn(m.arr != NULL, *((T *)NULL)); +- AssertReturn(aIdx < size(), *((T *)NULL)); ++ AssertReturn(m.arr != NULL, *((T *)1)); ++ AssertReturn(aIdx < size(), *((T *)1)); + #ifdef VBOX_WITH_XPCOM + return m.arr[aIdx]; + #else +- AssertReturn(m.raw != NULL, *((T *)NULL)); ++ AssertReturn(m.raw != NULL, *((T *)1)); + return m.raw[aIdx]; + #endif + } +@@ -960,7 +960,7 @@ class SafeArray : public Traits (public) + #ifdef VBOX_WITH_XPCOM + return m.arr[aIdx]; + #else +- AssertReturn(m.raw != NULL, *((T *)NULL)); ++ AssertReturn(m.raw != NULL, *((T *)1)); + return m.raw[aIdx]; + #endif + } diff --git a/emulators/xen-kernel/Makefile b/emulators/xen-kernel/Makefile index ff6b4de3b3e..4ffb7218cda 100644 --- a/emulators/xen-kernel/Makefile +++ b/emulators/xen-kernel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xen -PORTVERSION= 4.11.1 -PORTREVISION= 1 +PORTVERSION= 4.12.0 +PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ PKGNAMESUFFIX= -kernel @@ -22,53 +22,8 @@ MAKE_ARGS= clang=y PYTHON=${PYTHON_CMD} ARCH=x86_64 NO_MTREE= yes STRIP= # PLIST_FILES= /boot/xen \ - /boot/xen.4th \ lib/debug/boot/xen.debug -# IOMMU fixes -EXTRA_PATCHES= ${FILESDIR}/0001-pci-treat-class-0-devices-as-endpoints.patch:-p1 -# vPCI MSI fixes -EXTRA_PATCHES+= ${FILESDIR}/0001-vpci-msi-split-code-to-bind-pirq.patch:-p1 \ - ${FILESDIR}/0002-vpci-msi-fix-update-of-bound-MSI-interrupts.patch:-p1 -# Add extra RAM regions to Dom0 memory map as UNUSABNLE -EXTRA_PATCHES+= ${FILESDIR}/0001-x86-dom0-add-extra-RAM-regions-as-UNUSABLE-for-PVH-m.patch:-p1 -# MTRR guest setup for PVH -EXTRA_PATCHES+= ${FILESDIR}/0001-x86-mtrr-introduce-mask-to-get-VCNT-from-MTRRcap-MSR.patch:-p1 \ - ${FILESDIR}/0001-x86-HVM-improve-MTRR-load-checks.patch:-p1 \ - ${FILESDIR}/0002-x86-mtrr-split-enabled-field-into-two-boolean-flags.patch:-p1 \ - ${FILESDIR}/0003-hvm-mtrr-add-emacs-local-variables-block-with-format.patch:-p1 \ - ${FILESDIR}/0004-hvm-mtrr-use-the-hardware-number-of-variable-ranges-.patch:-p1 \ - ${FILESDIR}/0005-hvm-mtrr-copy-hardware-state-for-Dom0.patch:-p1 \ - ${FILESDIR}/0006-libxc-pvh-set-default-MTRR-type-to-write-back.patch:-p1 \ - ${FILESDIR}/0007-docs-pvh-document-initial-MTRR-state.patch:-p1 -# Build with lld (LLVM linker) -EXTRA_PATCHES+= ${FILESDIR}/0001-x86-replace-usage-in-the-linker-script.patch:-p1 -# Fix PVH Dom0 build with shadow paging -EXTRA_PATCHES+= ${FILESDIR}/0001-x86-pvh-change-the-order-of-the-iommu-initialization.patch:-p1 -# Forward dom0 lapic EOIs to underlying hardware -EXTRA_PATCHES+= ${FILESDIR}/0001-x86-dom0-propagate-PVH-vlapic-EOIs-to-hardware.patch:-p1 -# Fix deadlock in IO-APIC gsi mapping -EXTRA_PATCHES+= ${FILESDIR}/0001-pvh-dom0-fix-deadlock-in-GSI-mapping.patch:-p1 -# Fix for migration/save -EXTRA_PATCHES+= ${FILESDIR}/0001-x86-mm-locks-remove-trailing-whitespace.patch:-p1 \ - ${FILESDIR}/0002-x86-mm-locks-convert-some-macros-to-inline-functions.patch:-p1 \ - ${FILESDIR}/0003-x86-mm-locks-apply-a-bias-to-lock-levels-for-control.patch:-p1 - -# XSA-284 -EXTRA_PATCHES+= ${FILESDIR}/xsa284.patch:-p1 -# XSA-287 -EXTRA_PATCHES+= ${FILESDIR}/xsa287-4.11.patch:-p1 -# XSA-290 -EXTRA_PATCHES+= ${FILESDIR}/xsa290-4.11-1.patch:-p1 \ - ${FILESDIR}/xsa290-4.11-2.patch:-p1 -# XSA-292 -EXTRA_PATCHES+= ${FILESDIR}/xsa292.patch:-p1 -# XSA-293 -EXTRA_PATCHES+= ${FILESDIR}/xsa293-4.11-1.patch:-p1 \ - ${FILESDIR}/xsa293-4.11-2.patch:-p1 -# XSA-294 -EXTRA_PATCHES+= ${FILESDIR}/xsa294-4.11.patch:-p1 - .include .if ${OPSYS} != FreeBSD @@ -88,7 +43,6 @@ do-install: ${MKDIR} ${STAGEDIR}/boot ${MKDIR} ${STAGEDIR}${PREFIX}/lib/debug/boot/ ${INSTALL_PROGRAM} ${WRKSRC}/xen/xen ${STAGEDIR}/boot - ${INSTALL_DATA} ${FILESDIR}/xen.4th ${STAGEDIR}/boot ${INSTALL_DATA} ${WRKSRC}/xen/xen-syms ${STAGEDIR}${PREFIX}/lib/debug/boot/xen.debug .include diff --git a/emulators/xen-kernel/distinfo b/emulators/xen-kernel/distinfo index a61ead1394a..85ee9e3c004 100644 --- a/emulators/xen-kernel/distinfo +++ b/emulators/xen-kernel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550823720 -SHA256 (xen-4.11.1.tar.gz) = be88cb2443761990efc1070d9718016561fe19066af232f9bfae572922897e59 -SIZE (xen-4.11.1.tar.gz) = 25152217 +TIMESTAMP = 1555345627 +SHA256 (xen-4.12.0.tar.gz) = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64 +SIZE (xen-4.12.0.tar.gz) = 26949697 diff --git a/emulators/xen-kernel/files/0001-pci-treat-class-0-devices-as-endpoints.patch b/emulators/xen-kernel/files/0001-pci-treat-class-0-devices-as-endpoints.patch deleted file mode 100644 index 502603a89f4..00000000000 --- a/emulators/xen-kernel/files/0001-pci-treat-class-0-devices-as-endpoints.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7495a5b6aa1c741964baf18a1cbdb8b8d71cce98 Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Tue, 8 May 2018 11:33:00 +0200 -Subject: [PATCH] pci: treat class 0 devices as endpoints -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Class 0 devices are legacy pre PCI 2.0 devices that didn't have a -class code. Treat them as endpoints, so that they can be handled by -the IOMMU and properly passed-through to the hardware domain. - -Such device has been seen on a Super Micro server, lspci -vv reports: - -00:13.0 Non-VGA unclassified device: Intel Corporation Device a135 (rev 31) - Subsystem: Super Micro Computer Inc Device 0931 - Flags: bus master, fast devsel, latency 0, IRQ 11 - Memory at df222000 (64-bit, non-prefetchable) [size=4K] - Capabilities: [80] Power Management version 3 - -Arguably this is not a legacy device (since this is a new server), but -in any case Xen needs to deal with it. - -Suggested-by: Andrew Cooper -Signed-off-by: Roger Pau Monné -Acked-by: Jan Beulich ---- - xen/drivers/passthrough/pci.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c -index 1db69d5b99..c4890a4295 100644 ---- a/xen/drivers/passthrough/pci.c -+++ b/xen/drivers/passthrough/pci.c -@@ -927,10 +927,11 @@ enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) - case PCI_CLASS_BRIDGE_HOST: - return DEV_TYPE_PCI_HOST_BRIDGE; - -- case 0x0000: case 0xffff: -+ case 0xffff: - return DEV_TYPE_PCI_UNKNOWN; - } - -+ /* NB: treat legacy pre PCI 2.0 devices (class_device == 0) as endpoints. */ - return pos ? DEV_TYPE_PCIe_ENDPOINT : DEV_TYPE_PCI; - } - --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0001-pvh-dom0-fix-deadlock-in-GSI-mapping.patch b/emulators/xen-kernel/files/0001-pvh-dom0-fix-deadlock-in-GSI-mapping.patch deleted file mode 100644 index e2258d28d36..00000000000 --- a/emulators/xen-kernel/files/0001-pvh-dom0-fix-deadlock-in-GSI-mapping.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 603ad88fe8a681a2c5408c3f432d7083dd1c41b1 Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Mon, 28 Jan 2019 15:22:45 +0100 -Subject: [PATCH] pvh/dom0: fix deadlock in GSI mapping -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The current GSI mapping code can cause the following deadlock: - -(XEN) *** Dumping CPU0 host state: *** -(XEN) ----[ Xen-4.12.0-rc x86_64 debug=y Tainted: C ]---- -[...] -(XEN) Xen call trace: -(XEN) [] vmac.c#_spin_lock_cb+0x32/0x70 -(XEN) [] vmac.c#hvm_gsi_assert+0x2f/0x60 <- pick hvm.irq_lock -(XEN) [] io.c#hvm_dirq_assist+0xd9/0x130 <- pick event_lock -(XEN) [] io.c#dpci_softirq+0xdb/0x120 -(XEN) [] softirq.c#__do_softirq+0x46/0xa0 -(XEN) [] domain.c#idle_loop+0x35/0x90 -(XEN) -[...] -(XEN) *** Dumping CPU3 host state: *** -(XEN) ----[ Xen-4.12.0-rc x86_64 debug=y Tainted: C ]---- -[...] -(XEN) Xen call trace: -(XEN) [] vmac.c#_spin_lock_cb+0x3d/0x70 -(XEN) [] vmac.c#allocate_and_map_gsi_pirq+0xc8/0x130 <- pick event_lock -(XEN) [] vioapic.c#vioapic_hwdom_map_gsi+0x80/0x130 -(XEN) [] vioapic.c#vioapic_write_redirent+0x119/0x1c0 <- pick hvm.irq_lock -(XEN) [] vioapic.c#vioapic_write+0x35/0x40 -(XEN) [] vmac.c#hvm_process_io_intercept+0xd2/0x230 -(XEN) [] vmac.c#hvm_io_intercept+0x22/0x50 -(XEN) [] emulate.c#hvmemul_do_io+0x21b/0x3c0 -(XEN) [] emulate.c#hvmemul_do_io_buffer+0x32/0x70 -(XEN) [] emulate.c#hvmemul_do_mmio_buffer+0x29/0x30 -(XEN) [] emulate.c#hvmemul_phys_mmio_access+0xf9/0x1b0 -(XEN) [] emulate.c#hvmemul_linear_mmio_access+0xf0/0x180 -(XEN) [] emulate.c#hvmemul_linear_mmio_write+0x21/0x30 -(XEN) [] emulate.c#linear_write+0xa2/0x100 -(XEN) [] emulate.c#hvmemul_write+0xb5/0x120 -(XEN) [] vmac.c#x86_emulate+0x132aa/0x149a0 -(XEN) [] vmac.c#x86_emulate_wrapper+0x29/0x70 -(XEN) [] emulate.c#_hvm_emulate_one+0x50/0x140 -(XEN) [] vmac.c#hvm_emulate_one_insn+0x41/0x100 -(XEN) [] guest_4.o#sh_page_fault__guest_4+0x976/0xd30 -(XEN) [] vmac.c#vmx_vmexit_handler+0x949/0xea0 -(XEN) [] vmac.c#vmx_asm_vmexit_handler+0xfa/0x270 - -In order to solve it move the vioapic_hwdom_map_gsi outside of the -locked region in vioapic_write_redirent. vioapic_hwdom_map_gsi will -not access any of the vioapic fields, so there's no need to call the -function holding the hvm.irq_lock. - -Signed-off-by: Roger Pau Monné -Reviewed-by: Wei Liu -Reviewed-by: Jan Beulich -Release-acked-by: Juergen Gross ---- - xen/arch/x86/hvm/vioapic.c | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c -index 2b74f92d51..2d71c33c1c 100644 ---- a/xen/arch/x86/hvm/vioapic.c -+++ b/xen/arch/x86/hvm/vioapic.c -@@ -236,20 +236,6 @@ static void vioapic_write_redirent( - - *pent = ent; - -- if ( is_hardware_domain(d) && unmasked ) -- { -- int ret; -- -- ret = vioapic_hwdom_map_gsi(gsi, ent.fields.trig_mode, -- ent.fields.polarity); -- if ( ret ) -- { -- /* Mask the entry again. */ -- pent->fields.mask = 1; -- unmasked = 0; -- } -- } -- - if ( gsi == 0 ) - { - vlapic_adjust_i8259_target(d); -@@ -266,6 +252,24 @@ static void vioapic_write_redirent( - - spin_unlock(&d->arch.hvm.irq_lock); - -+ if ( is_hardware_domain(d) && unmasked ) -+ { -+ /* -+ * NB: don't call vioapic_hwdom_map_gsi while holding hvm.irq_lock -+ * since it can cause deadlocks as event_lock is taken by -+ * allocate_and_map_gsi_pirq, and that will invert the locking order -+ * used by other parts of the code. -+ */ -+ int ret = vioapic_hwdom_map_gsi(gsi, ent.fields.trig_mode, -+ ent.fields.polarity); -+ if ( ret ) -+ { -+ gprintk(XENLOG_ERR, -+ "unable to bind gsi %u to hardware domain: %d\n", gsi, ret); -+ unmasked = 0; -+ } -+ } -+ - if ( gsi == 0 || unmasked ) - pt_may_unmask_irq(d, NULL); - } --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/0001-vpci-msi-split-code-to-bind-pirq.patch b/emulators/xen-kernel/files/0001-vpci-msi-split-code-to-bind-pirq.patch deleted file mode 100644 index 21b8ae0442d..00000000000 --- a/emulators/xen-kernel/files/0001-vpci-msi-split-code-to-bind-pirq.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 9109e5afb99012244e9fbe7f44e7010950051443 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Mon, 2 Jul 2018 13:07:26 +0200 -Subject: [PATCH 1/2] vpci/msi: split code to bind pirq -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -And put it in a separate update function. This is required in order to -improve binding of MSI PIRQs when using vPCI. - -No functional change. - -Signed-off-by: Roger Pau Monné -Reviewed-by: Jan Beulich ---- - xen/arch/x86/hvm/vmsi.c | 73 +++++++++++++++++++++++++---------------- - 1 file changed, 45 insertions(+), 28 deletions(-) - -diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c -index 5ab7387d78..acadc23f8d 100644 ---- a/xen/arch/x86/hvm/vmsi.c -+++ b/xen/arch/x86/hvm/vmsi.c -@@ -663,6 +663,42 @@ void vpci_msi_arch_mask(struct vpci_msi *msi, const struct pci_dev *pdev, - vpci_mask_pirq(pdev->domain, msi->arch.pirq + entry, mask); - } - -+static int vpci_msi_update(const struct pci_dev *pdev, uint32_t data, -+ uint64_t address, unsigned int vectors, -+ unsigned int pirq, uint32_t mask) -+{ -+ unsigned int i; -+ -+ ASSERT(pcidevs_locked()); -+ -+ for ( i = 0; i < vectors; i++ ) -+ { -+ uint8_t vector = MASK_EXTR(data, MSI_DATA_VECTOR_MASK); -+ uint8_t vector_mask = 0xff >> (8 - fls(vectors) + 1); -+ struct xen_domctl_bind_pt_irq bind = { -+ .machine_irq = pirq + i, -+ .irq_type = PT_IRQ_TYPE_MSI, -+ .u.msi.gvec = (vector & ~vector_mask) | -+ ((vector + i) & vector_mask), -+ .u.msi.gflags = msi_gflags(data, address, (mask >> i) & 1), -+ }; -+ int rc = pt_irq_create_bind(pdev->domain, &bind); -+ -+ if ( rc ) -+ { -+ gdprintk(XENLOG_ERR, -+ "%04x:%02x:%02x.%u: failed to bind PIRQ %u: %d\n", -+ pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), -+ PCI_FUNC(pdev->devfn), pirq + i, rc); -+ while ( bind.machine_irq-- > pirq ) -+ pt_irq_destroy_bind(pdev->domain, &bind); -+ return rc; -+ } -+ } -+ -+ return 0; -+} -+ - static int vpci_msi_enable(const struct pci_dev *pdev, uint32_t data, - uint64_t address, unsigned int nr, - paddr_t table_base, uint32_t mask) -@@ -674,7 +710,7 @@ static int vpci_msi_enable(const struct pci_dev *pdev, uint32_t data, - .table_base = table_base, - .entry_nr = nr, - }; -- unsigned int i, vectors = table_base ? 1 : nr; -+ unsigned vectors = table_base ? 1 : nr; - int rc, pirq = INVALID_PIRQ; - - /* Get a PIRQ. */ -@@ -690,36 +726,17 @@ static int vpci_msi_enable(const struct pci_dev *pdev, uint32_t data, - return rc; - } - -- for ( i = 0; i < vectors; i++ ) -+ pcidevs_lock(); -+ rc = vpci_msi_update(pdev, data, address, vectors, pirq, mask); -+ if ( rc ) - { -- uint8_t vector = MASK_EXTR(data, MSI_DATA_VECTOR_MASK); -- uint8_t vector_mask = 0xff >> (8 - fls(vectors) + 1); -- struct xen_domctl_bind_pt_irq bind = { -- .machine_irq = pirq + i, -- .irq_type = PT_IRQ_TYPE_MSI, -- .u.msi.gvec = (vector & ~vector_mask) | -- ((vector + i) & vector_mask), -- .u.msi.gflags = msi_gflags(data, address, (mask >> i) & 1), -- }; -- -- pcidevs_lock(); -- rc = pt_irq_create_bind(pdev->domain, &bind); -- if ( rc ) -- { -- gdprintk(XENLOG_ERR, -- "%04x:%02x:%02x.%u: failed to bind PIRQ %u: %d\n", -- pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), -- PCI_FUNC(pdev->devfn), pirq + i, rc); -- while ( bind.machine_irq-- > pirq ) -- pt_irq_destroy_bind(pdev->domain, &bind); -- spin_lock(&pdev->domain->event_lock); -- unmap_domain_pirq(pdev->domain, pirq); -- spin_unlock(&pdev->domain->event_lock); -- pcidevs_unlock(); -- return rc; -- } -+ spin_lock(&pdev->domain->event_lock); -+ unmap_domain_pirq(pdev->domain, pirq); -+ spin_unlock(&pdev->domain->event_lock); - pcidevs_unlock(); -+ return rc; - } -+ pcidevs_unlock(); - - return pirq; - } --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0001-x86-HVM-improve-MTRR-load-checks.patch b/emulators/xen-kernel/files/0001-x86-HVM-improve-MTRR-load-checks.patch deleted file mode 100644 index 9770ddd67c8..00000000000 --- a/emulators/xen-kernel/files/0001-x86-HVM-improve-MTRR-load-checks.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 76159f10b174d8a5cd4c50213a9d21fcc0e9441d Mon Sep 17 00:00:00 2001 -From: Jan Beulich -Date: Mon, 16 Jul 2018 15:08:02 +0200 -Subject: [PATCH 1/7] x86/HVM: improve MTRR load checks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We should not assume that the incoming set of values contains exactly -MTRR_VCNT variable range MSRs. Permit a smaller amount and reject a -bigger one. As a result the save path then also needs to no longer use -a fixed upper bound, in turn requiring unused space in the save record -to be zeroed up front. - -Also slightly refine types where appropriate. - -Signed-off-by: Jan Beulich -[switch to use MASK_EXTR to get VCNT] -Signed-off-by: Roger Pau Monné ---- - xen/arch/x86/hvm/mtrr.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c -index c2927fb437..a636012388 100644 ---- a/xen/arch/x86/hvm/mtrr.c -+++ b/xen/arch/x86/hvm/mtrr.c -@@ -673,22 +673,22 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, - - static int hvm_save_mtrr_msr(struct domain *d, hvm_domain_context_t *h) - { -- int i; - struct vcpu *v; -- struct hvm_hw_mtrr hw_mtrr; -- struct mtrr_state *mtrr_state; -+ - /* save mtrr&pat */ - for_each_vcpu(d, v) - { -- mtrr_state = &v->arch.hvm_vcpu.mtrr; -+ const struct mtrr_state *mtrr_state = &v->arch.hvm_vcpu.mtrr; -+ struct hvm_hw_mtrr hw_mtrr = { -+ .msr_mtrr_def_type = mtrr_state->def_type | -+ (mtrr_state->enabled << 10), -+ .msr_mtrr_cap = mtrr_state->mtrr_cap, -+ }; -+ unsigned int i; - - hvm_get_guest_pat(v, &hw_mtrr.msr_pat_cr); - -- hw_mtrr.msr_mtrr_def_type = mtrr_state->def_type -- | (mtrr_state->enabled << 10); -- hw_mtrr.msr_mtrr_cap = mtrr_state->mtrr_cap; -- -- for ( i = 0; i < MTRR_VCNT; i++ ) -+ for ( i = 0; i < MASK_EXTR(hw_mtrr.msr_mtrr_cap, MTRRcap_VCNT); i++ ) - { - /* save physbase */ - hw_mtrr.msr_mtrr_var[i*2] = -@@ -726,6 +726,14 @@ static int hvm_load_mtrr_msr(struct domain *d, hvm_domain_context_t *h) - if ( hvm_load_entry(MTRR, h, &hw_mtrr) != 0 ) - return -EINVAL; - -+ if ( MASK_EXTR(hw_mtrr.msr_mtrr_cap, MTRRcap_VCNT) > MTRR_VCNT ) -+ { -+ dprintk(XENLOG_G_ERR, -+ "HVM restore: %pv: too many (%lu) variable range MTRRs\n", -+ v, MASK_EXTR(hw_mtrr.msr_mtrr_cap, MTRRcap_VCNT)); -+ return -EINVAL; -+ } -+ - mtrr_state = &v->arch.hvm_vcpu.mtrr; - - hvm_set_guest_pat(v, hw_mtrr.msr_pat_cr); -@@ -735,7 +743,7 @@ static int hvm_load_mtrr_msr(struct domain *d, hvm_domain_context_t *h) - for ( i = 0; i < NUM_FIXED_MSR; i++ ) - mtrr_fix_range_msr_set(d, mtrr_state, i, hw_mtrr.msr_mtrr_fixed[i]); - -- for ( i = 0; i < MTRR_VCNT; i++ ) -+ for ( i = 0; i < MASK_EXTR(hw_mtrr.msr_mtrr_cap, MTRRcap_VCNT); i++ ) - { - mtrr_var_range_msr_set(d, mtrr_state, - MSR_IA32_MTRR_PHYSBASE(i), --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0001-x86-dom0-add-extra-RAM-regions-as-UNUSABLE-for-PVH-m.patch b/emulators/xen-kernel/files/0001-x86-dom0-add-extra-RAM-regions-as-UNUSABLE-for-PVH-m.patch deleted file mode 100644 index 11808d48eae..00000000000 --- a/emulators/xen-kernel/files/0001-x86-dom0-add-extra-RAM-regions-as-UNUSABLE-for-PVH-m.patch +++ /dev/null @@ -1,94 +0,0 @@ -From e8e58be2b77708fd4d6ba6bca3f70bc507fde4be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Tue, 26 Jun 2018 08:48:14 +0200 -Subject: [PATCH] x86/dom0: add extra RAM regions as UNUSABLE for PVH memory - map -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When running as PVH Dom0 the native memory map is used in order to -craft a tailored memory map for Dom0 taking into account it's memory -limit. - -Dom0 memory is always going to be smaller than the total amount -of memory present on the host, so in order to prevent Dom0 from -relocating PCI BARs over RAM regions mark all the RAM regions not -available to Dom0 as UNUSABLE in the memory map. - -Signed-off-by: Roger Pau Monné -Acked-by: Jan Beulich ---- - xen/arch/x86/hvm/dom0_build.c | 25 +++++++++++++++++-------- - 1 file changed, 17 insertions(+), 8 deletions(-) - -diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c -index b237508072..e2b5d48e03 100644 ---- a/xen/arch/x86/hvm/dom0_build.c -+++ b/xen/arch/x86/hvm/dom0_build.c -@@ -314,8 +314,10 @@ static __init void pvh_setup_e820(struct domain *d, unsigned long nr_pages) - - /* - * Craft the e820 memory map for Dom0 based on the hardware e820 map. -+ * Add an extra entry in case we have to split a RAM entry into a RAM and a -+ * UNUSABLE one in order to truncate it. - */ -- d->arch.e820 = xzalloc_array(struct e820entry, e820.nr_map); -+ d->arch.e820 = xzalloc_array(struct e820entry, e820.nr_map + 1); - if ( !d->arch.e820 ) - panic("Unable to allocate memory for Dom0 e820 map"); - entry_guest = d->arch.e820; -@@ -323,19 +325,20 @@ static __init void pvh_setup_e820(struct domain *d, unsigned long nr_pages) - /* Clamp e820 memory map to match the memory assigned to Dom0 */ - for ( i = 0, entry = e820.map; i < e820.nr_map; i++, entry++ ) - { -+ *entry_guest = *entry; -+ - if ( entry->type != E820_RAM ) -- { -- *entry_guest = *entry; - goto next; -- } - - if ( nr_pages == cur_pages ) - { - /* -- * We already have all the assigned memory, -- * skip this entry -+ * We already have all the requested memory, turn this RAM region -+ * into a UNUSABLE region in order to prevent Dom0 from placing -+ * BARs in this area. - */ -- continue; -+ entry_guest->type = E820_UNUSABLE; -+ goto next; - } - - /* -@@ -358,6 +361,12 @@ static __init void pvh_setup_e820(struct domain *d, unsigned long nr_pages) - { - /* Truncate region */ - entry_guest->size = (nr_pages - cur_pages) << PAGE_SHIFT; -+ /* Add the remaining of the RAM region as UNUSABLE. */ -+ entry_guest++; -+ d->arch.nr_e820++; -+ entry_guest->type = E820_UNUSABLE; -+ entry_guest->addr = start + ((nr_pages - cur_pages) << PAGE_SHIFT); -+ entry_guest->size = end - entry_guest->addr; - cur_pages = nr_pages; - } - else -@@ -367,9 +376,9 @@ static __init void pvh_setup_e820(struct domain *d, unsigned long nr_pages) - next: - d->arch.nr_e820++; - entry_guest++; -+ ASSERT(d->arch.nr_e820 <= e820.nr_map + 1); - } - ASSERT(cur_pages == nr_pages); -- ASSERT(d->arch.nr_e820 <= e820.nr_map); - } - - static int __init pvh_setup_p2m(struct domain *d) --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0001-x86-dom0-propagate-PVH-vlapic-EOIs-to-hardware.patch b/emulators/xen-kernel/files/0001-x86-dom0-propagate-PVH-vlapic-EOIs-to-hardware.patch deleted file mode 100644 index aaf3a2da22c..00000000000 --- a/emulators/xen-kernel/files/0001-x86-dom0-propagate-PVH-vlapic-EOIs-to-hardware.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 19d2bce1c3cbfdc636c142cdf0ae38795f2202dd Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Thu, 14 Feb 2019 14:41:03 +0100 -Subject: [PATCH for-4.12] x86/dom0: propagate PVH vlapic EOIs to hardware -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Current check for MSI EIO is missing a special case for PVH Dom0, -which doesn't have a hvm_irq_dpci struct but requires EIOs to be -forwarded to the physical lapic for passed-through devices. - -Add a short-circuit to allow EOIs from PVH Dom0 to be propagated. - -Signed-off-by: Roger Pau Monné ---- -Cc: Jan Beulich -Cc: Juergen Gross ---- - xen/drivers/passthrough/io.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c -index a6eb8a4336..4290c7c710 100644 ---- a/xen/drivers/passthrough/io.c -+++ b/xen/drivers/passthrough/io.c -@@ -869,7 +869,8 @@ static int _hvm_dpci_msi_eoi(struct domain *d, - - void hvm_dpci_msi_eoi(struct domain *d, int vector) - { -- if ( !iommu_enabled || !hvm_domain_irq(d)->dpci ) -+ if ( !iommu_enabled || -+ (!hvm_domain_irq(d)->dpci && !is_hardware_domain(d)) ) - return; - - spin_lock(&d->event_lock); --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/0001-x86-mm-locks-remove-trailing-whitespace.patch b/emulators/xen-kernel/files/0001-x86-mm-locks-remove-trailing-whitespace.patch deleted file mode 100644 index 6f6210f9ad0..00000000000 --- a/emulators/xen-kernel/files/0001-x86-mm-locks-remove-trailing-whitespace.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 468937da985661e5cd1d6b2df6d6ab2d1fb1e5e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Tue, 12 Mar 2019 12:21:03 +0100 -Subject: [PATCH 1/3] x86/mm-locks: remove trailing whitespace -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -No functional change. - -Signed-off-by: Roger Pau Monné -Reviewed-by: George Dunlap ---- - xen/arch/x86/mm/mm-locks.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/xen/arch/x86/mm/mm-locks.h b/xen/arch/x86/mm/mm-locks.h -index e5fceb2d2e..6c15b9a4cc 100644 ---- a/xen/arch/x86/mm/mm-locks.h -+++ b/xen/arch/x86/mm/mm-locks.h -@@ -3,11 +3,11 @@ - * - * Spinlocks used by the code in arch/x86/mm. - * -- * Copyright (c) 2011 Citrix Systems, inc. -+ * Copyright (c) 2011 Citrix Systems, inc. - * Copyright (c) 2007 Advanced Micro Devices (Wei Huang) - * Copyright (c) 2006-2007 XenSource Inc. - * Copyright (c) 2006 Michael A Fetterman -- * -+ * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or -@@ -41,7 +41,7 @@ static inline void mm_lock_init(mm_lock_t *l) - l->unlock_level = 0; - } - --static inline int mm_locked_by_me(mm_lock_t *l) -+static inline int mm_locked_by_me(mm_lock_t *l) - { - return (l->lock.recurse_cpu == current->processor); - } -@@ -67,7 +67,7 @@ do { \ - - static inline void _mm_lock(mm_lock_t *l, const char *func, int level, int rec) - { -- if ( !((mm_locked_by_me(l)) && rec) ) -+ if ( !((mm_locked_by_me(l)) && rec) ) - __check_lock_level(level); - spin_lock_recursive(&l->lock); - if ( l->lock.recurse_cnt == 1 ) -@@ -186,7 +186,7 @@ static inline void mm_unlock(mm_lock_t *l) - spin_unlock_recursive(&l->lock); - } - --static inline void mm_enforce_order_unlock(int unlock_level, -+static inline void mm_enforce_order_unlock(int unlock_level, - unsigned short *recurse_count) - { - if ( recurse_count ) -@@ -310,7 +310,7 @@ declare_mm_rwlock(altp2m); - #define gfn_locked_by_me(p,g) p2m_locked_by_me(p) - - /* PoD lock (per-p2m-table) -- * -+ * - * Protects private PoD data structs: entry and cache - * counts, page lists, sweep parameters. */ - -@@ -322,7 +322,7 @@ declare_mm_lock(pod) - - /* Page alloc lock (per-domain) - * -- * This is an external lock, not represented by an mm_lock_t. However, -+ * This is an external lock, not represented by an mm_lock_t. However, - * pod code uses it in conjunction with the p2m lock, and expecting - * the ordering which we enforce here. - * The lock is not recursive. */ -@@ -338,13 +338,13 @@ declare_mm_order_constraint(page_alloc) - * For shadow pagetables, this lock protects - * - all changes to shadow page table pages - * - the shadow hash table -- * - the shadow page allocator -+ * - the shadow page allocator - * - all changes to guest page table pages - * - all changes to the page_info->tlbflush_timestamp -- * - the page_info->count fields on shadow pages -- * -- * For HAP, it protects the NPT/EPT tables and mode changes. -- * -+ * - the page_info->count fields on shadow pages -+ * -+ * For HAP, it protects the NPT/EPT tables and mode changes. -+ * - * It also protects the log-dirty bitmap from concurrent accesses (and - * teardowns, etc). */ - --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/0001-x86-mtrr-introduce-mask-to-get-VCNT-from-MTRRcap-MSR.patch b/emulators/xen-kernel/files/0001-x86-mtrr-introduce-mask-to-get-VCNT-from-MTRRcap-MSR.patch deleted file mode 100644 index d8f8e38bafb..00000000000 --- a/emulators/xen-kernel/files/0001-x86-mtrr-introduce-mask-to-get-VCNT-from-MTRRcap-MSR.patch +++ /dev/null @@ -1,87 +0,0 @@ -From f7c587fa1341b59f4ff654bd7e55e162f3513130 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Thu, 5 Jul 2018 15:28:56 +0200 -Subject: [PATCH] x86/mtrr: introduce mask to get VCNT from MTRRcap MSR -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -No functional change. - -Signed-off-by: Roger Pau Monné -Reviewed-by: Jan Beulich ---- - xen/arch/x86/cpu/mtrr/main.c | 2 +- - xen/arch/x86/hvm/mtrr.c | 8 ++++---- - xen/include/asm-x86/msr-index.h | 2 ++ - 3 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c -index 56f71a6e1f..e9df53f00d 100644 ---- a/xen/arch/x86/cpu/mtrr/main.c -+++ b/xen/arch/x86/cpu/mtrr/main.c -@@ -95,7 +95,7 @@ static void __init set_num_var_ranges(void) - config = 2; - else if (is_cpu(CENTAUR)) - config = 8; -- num_var_ranges = config & 0xff; -+ num_var_ranges = MASK_EXTR(config, MTRRcap_VCNT); - } - - static void __init init_table(void) -diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c -index c78e5c17ad..c2927fb437 100644 ---- a/xen/arch/x86/hvm/mtrr.c -+++ b/xen/arch/x86/hvm/mtrr.c -@@ -78,7 +78,7 @@ static uint8_t __read_mostly pat_entry_tbl[PAT_TYPE_NUMS] = - bool_t is_var_mtrr_overlapped(const struct mtrr_state *m) - { - unsigned int seg, i; -- unsigned int num_var_ranges = (uint8_t)m->mtrr_cap; -+ unsigned int num_var_ranges = MASK_EXTR(m->mtrr_cap, MTRRcap_VCNT); - - for ( i = 0; i < num_var_ranges; i++ ) - { -@@ -193,7 +193,7 @@ static int get_mtrr_type(const struct mtrr_state *m, - uint8_t overlap_mtrr = 0; - uint8_t overlap_mtrr_pos = 0; - uint64_t mask = -(uint64_t)PAGE_SIZE << order; -- unsigned int seg, num_var_ranges = m->mtrr_cap & 0xff; -+ unsigned int seg, num_var_ranges = MASK_EXTR(m->mtrr_cap, MTRRcap_VCNT); - - if ( unlikely(!(m->enabled & 0x2)) ) - return MTRR_TYPE_UNCACHABLE; -@@ -483,7 +483,7 @@ bool mtrr_pat_not_equal(const struct vcpu *vd, const struct vcpu *vs) - - if ( md->enabled & 2 ) - { -- unsigned int num_var_ranges = (uint8_t)md->mtrr_cap; -+ unsigned int num_var_ranges = MASK_EXTR(md->mtrr_cap, MTRRcap_VCNT); - - /* Test default type MSR. */ - if ( md->def_type != ms->def_type ) -@@ -499,7 +499,7 @@ bool mtrr_pat_not_equal(const struct vcpu *vd, const struct vcpu *vs) - return true; - - /* Test variable ranges. */ -- if ( num_var_ranges != (uint8_t)ms->mtrr_cap || -+ if ( num_var_ranges != MASK_EXTR(ms->mtrr_cap, MTRRcap_VCNT) || - memcmp(md->var_ranges, ms->var_ranges, - num_var_ranges * sizeof(*md->var_ranges)) ) - return true; -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 8fbccc88a7..95bb66916c 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -60,6 +60,8 @@ - #define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) - - #define MSR_MTRRcap 0x000000fe -+#define MTRRcap_VCNT 0x000000ff -+ - #define MSR_IA32_BBL_CR_CTL 0x00000119 - - #define MSR_IA32_SYSENTER_CS 0x00000174 --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0001-x86-pvh-change-the-order-of-the-iommu-initialization.patch b/emulators/xen-kernel/files/0001-x86-pvh-change-the-order-of-the-iommu-initialization.patch deleted file mode 100644 index 7e7fe935df2..00000000000 --- a/emulators/xen-kernel/files/0001-x86-pvh-change-the-order-of-the-iommu-initialization.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ec3d58041829e0747d94efa11a44467c3e083b60 Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Tue, 24 Jul 2018 13:12:18 +0200 -Subject: [PATCH] x86/pvh: change the order of the iommu initialization for - Dom0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The iommu initialization will also create MMIO mappings in the Dom0 -p2m, so the paging memory pool needs to be allocated or else iommu -initialization will fail. - -Move the call to init the iommu after the Dom0 p2m has been setup in -order to solve this. - -Note that issues caused by this wrong ordering have only been seen -when using shadow paging. - -Signed-off-by: Roger Pau Monné -Acked-by: Jan Beulich ---- -Cc: Jan Beulich -Cc: Andrew Cooper ---- - xen/arch/x86/hvm/dom0_build.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c -index 9a833fa4b9..f0cd63b1ec 100644 ---- a/xen/arch/x86/hvm/dom0_build.c -+++ b/xen/arch/x86/hvm/dom0_build.c -@@ -1093,8 +1093,6 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, - - printk(XENLOG_INFO "*** Building a PVH Dom%d ***\n", d->domain_id); - -- iommu_hwdom_init(d); -- - rc = pvh_setup_p2m(d); - if ( rc ) - { -@@ -1102,6 +1100,8 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, - return rc; - } - -+ iommu_hwdom_init(d); -+ - rc = pvh_load_kernel(d, image, image_headroom, initrd, bootstrap_map(image), - cmdline, &entry, &start_info); - if ( rc ) --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0001-x86-replace-usage-in-the-linker-script.patch b/emulators/xen-kernel/files/0001-x86-replace-usage-in-the-linker-script.patch deleted file mode 100644 index 4b1f808d9a7..00000000000 --- a/emulators/xen-kernel/files/0001-x86-replace-usage-in-the-linker-script.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e21ba44f771226a5f6f0ce269aabcfb019eae539 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Thu, 12 Jul 2018 10:48:18 +0200 -Subject: [PATCH] x86: replace '||' usage in the linker script -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With '|'. The result is the same, and the later works with lld. Fixes -the following error when building Xen with lld: - -ld -melf_x86_64_fbsd -T xen.lds -N prelink.o --build-id=sha1 \ - /root/src/xen/xen/common/symbols-dummy.o -o /root/src/xen/xen/.xen-syms.0 -ld: error: xen.lds:260: malformed number: | ->>> ASSERT(__image_base__ > (((((((((261 >> 8) * 0xffff000000000000) | (261 << 39))) + ((1 << 39) / 2)) + (64 << 30)) + (1 << 30)) + (1 << 30))) || ->>> ^ - -Signed-off-by: Roger Pau Monné -Reviewed-by: Jan Beulich ---- - xen/arch/x86/xen.lds.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S -index 70afedd31d..326e885402 100644 ---- a/xen/arch/x86/xen.lds.S -+++ b/xen/arch/x86/xen.lds.S -@@ -331,7 +331,7 @@ SECTIONS - .comment 0 : { *(.comment) } - } - --ASSERT(__image_base__ > XEN_VIRT_START || -+ASSERT(__image_base__ > XEN_VIRT_START | - __2M_rwdata_end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE, - "Xen image overlaps stubs area") - --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0002-vpci-msi-fix-update-of-bound-MSI-interrupts.patch b/emulators/xen-kernel/files/0002-vpci-msi-fix-update-of-bound-MSI-interrupts.patch deleted file mode 100644 index 80e7816adee..00000000000 --- a/emulators/xen-kernel/files/0002-vpci-msi-fix-update-of-bound-MSI-interrupts.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1e34ed7174cce6ab37e420dda9452267301fb7d2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Mon, 2 Jul 2018 13:07:55 +0200 -Subject: [PATCH 2/2] vpci/msi: fix update of bound MSI interrupts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Current update process of already bound MSI interrupts is wrong -because unmap_domain_pirq calls pci_disable_msi, which disables MSI -interrupts on the device. On the other hand map_domain_pirq doesn't -enable MSI, so the current update process of already enabled MSI -entries is wrong because MSI control bit will be disabled by -unmap_domain_pirq and not re-enabled by map_domain_pirq. - -In order to fix this avoid unmapping the PIRQs and just update the -binding of the PIRQ. A new arch helper to do that is introduced. - -Note that MSI-X is not affected because unmap_domain_pirq only -disables the MSI enable control bit for the MSI case, for MSI-X the -bit is left untouched by unmap_domain_pirq. - -Signed-off-by: Roger Pau Monné -Acked-by: Jan Beulich ---- - xen/arch/x86/hvm/vmsi.c | 23 +++++++++++++++++++++++ - xen/drivers/vpci/msi.c | 3 +-- - xen/include/xen/vpci.h | 2 ++ - 3 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c -index acadc23f8d..3001d5c488 100644 ---- a/xen/arch/x86/hvm/vmsi.c -+++ b/xen/arch/x86/hvm/vmsi.c -@@ -699,6 +699,29 @@ static int vpci_msi_update(const struct pci_dev *pdev, uint32_t data, - return 0; - } - -+int vpci_msi_arch_update(struct vpci_msi *msi, const struct pci_dev *pdev) -+{ -+ int rc; -+ -+ ASSERT(msi->arch.pirq != INVALID_PIRQ); -+ -+ pcidevs_lock(); -+ rc = vpci_msi_update(pdev, msi->data, msi->address, msi->vectors, -+ msi->arch.pirq, msi->mask); -+ if ( rc ) -+ { -+ spin_lock(&pdev->domain->event_lock); -+ unmap_domain_pirq(pdev->domain, msi->arch.pirq); -+ spin_unlock(&pdev->domain->event_lock); -+ pcidevs_unlock(); -+ msi->arch.pirq = INVALID_PIRQ; -+ return rc; -+ } -+ pcidevs_unlock(); -+ -+ return 0; -+} -+ - static int vpci_msi_enable(const struct pci_dev *pdev, uint32_t data, - uint64_t address, unsigned int nr, - paddr_t table_base, uint32_t mask) -diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c -index ad26c38a92..8f15ad7bf2 100644 ---- a/xen/drivers/vpci/msi.c -+++ b/xen/drivers/vpci/msi.c -@@ -87,8 +87,7 @@ static void update_msi(const struct pci_dev *pdev, struct vpci_msi *msi) - if ( !msi->enabled ) - return; - -- vpci_msi_arch_disable(msi, pdev); -- if ( vpci_msi_arch_enable(msi, pdev, msi->vectors) ) -+ if ( vpci_msi_arch_update(msi, pdev) ) - msi->enabled = false; - } - -diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h -index 72d2225a97..af2b8580ee 100644 ---- a/xen/include/xen/vpci.h -+++ b/xen/include/xen/vpci.h -@@ -159,6 +159,8 @@ int __must_check vpci_msi_arch_enable(struct vpci_msi *msi, - const struct pci_dev *pdev, - unsigned int vectors); - void vpci_msi_arch_disable(struct vpci_msi *msi, const struct pci_dev *pdev); -+int __must_check vpci_msi_arch_update(struct vpci_msi *msi, -+ const struct pci_dev *pdev); - void vpci_msi_arch_init(struct vpci_msi *msi); - void vpci_msi_arch_print(const struct vpci_msi *msi); - --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0002-x86-mm-locks-convert-some-macros-to-inline-functions.patch b/emulators/xen-kernel/files/0002-x86-mm-locks-convert-some-macros-to-inline-functions.patch deleted file mode 100644 index 86750bb1629..00000000000 --- a/emulators/xen-kernel/files/0002-x86-mm-locks-convert-some-macros-to-inline-functions.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 45e260afe7ee0e6b18a7e64173a081eec6e056aa Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Tue, 12 Mar 2019 12:24:37 +0100 -Subject: [PATCH 2/3] x86/mm-locks: convert some macros to inline functions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -And rename to have only one prefix underscore where applicable. - -No functional change. - -Signed-off-by: Roger Pau Monné -Reviewed-by: George Dunlap ---- - xen/arch/x86/mm/mm-locks.h | 98 ++++++++++++++++++++------------------ - 1 file changed, 52 insertions(+), 46 deletions(-) - -diff --git a/xen/arch/x86/mm/mm-locks.h b/xen/arch/x86/mm/mm-locks.h -index 6c15b9a4cc..d3497713e9 100644 ---- a/xen/arch/x86/mm/mm-locks.h -+++ b/xen/arch/x86/mm/mm-locks.h -@@ -29,7 +29,6 @@ - - /* Per-CPU variable for enforcing the lock ordering */ - DECLARE_PER_CPU(int, mm_lock_level); --#define __get_lock_level() (this_cpu(mm_lock_level)) - - DECLARE_PERCPU_RWLOCK_GLOBAL(p2m_percpu_rwlock); - -@@ -46,43 +45,47 @@ static inline int mm_locked_by_me(mm_lock_t *l) - return (l->lock.recurse_cpu == current->processor); - } - -+static inline int _get_lock_level(void) -+{ -+ return this_cpu(mm_lock_level); -+} -+ - /* - * If you see this crash, the numbers printed are order levels defined - * in this file. - */ --#define __check_lock_level(l) \ --do { \ -- if ( unlikely(__get_lock_level() > (l)) ) \ -- { \ -- printk("mm locking order violation: %i > %i\n", \ -- __get_lock_level(), (l)); \ -- BUG(); \ -- } \ --} while(0) -- --#define __set_lock_level(l) \ --do { \ -- __get_lock_level() = (l); \ --} while(0) -+static inline void _check_lock_level(int l) -+{ -+ if ( unlikely(_get_lock_level() > l) ) -+ { -+ printk("mm locking order violation: %i > %i\n", _get_lock_level(), l); -+ BUG(); -+ } -+} -+ -+static inline void _set_lock_level(int l) -+{ -+ this_cpu(mm_lock_level) = l; -+} - - static inline void _mm_lock(mm_lock_t *l, const char *func, int level, int rec) - { - if ( !((mm_locked_by_me(l)) && rec) ) -- __check_lock_level(level); -+ _check_lock_level(level); - spin_lock_recursive(&l->lock); - if ( l->lock.recurse_cnt == 1 ) - { - l->locker_function = func; -- l->unlock_level = __get_lock_level(); -+ l->unlock_level = _get_lock_level(); - } - else if ( (unlikely(!rec)) ) -- panic("mm lock already held by %s", l->locker_function); -- __set_lock_level(level); -+ panic("mm lock already held by %s\n", l->locker_function); -+ _set_lock_level(level); - } - - static inline void _mm_enforce_order_lock_pre(int level) - { -- __check_lock_level(level); -+ _check_lock_level(level); - } - - static inline void _mm_enforce_order_lock_post(int level, int *unlock_level, -@@ -92,12 +95,12 @@ static inline void _mm_enforce_order_lock_post(int level, int *unlock_level, - { - if ( (*recurse_count)++ == 0 ) - { -- *unlock_level = __get_lock_level(); -+ *unlock_level = _get_lock_level(); - } - } else { -- *unlock_level = __get_lock_level(); -+ *unlock_level = _get_lock_level(); - } -- __set_lock_level(level); -+ _set_lock_level(level); - } - - -@@ -118,12 +121,12 @@ static inline void _mm_write_lock(mm_rwlock_t *l, const char *func, int level) - { - if ( !mm_write_locked_by_me(l) ) - { -- __check_lock_level(level); -+ _check_lock_level(level); - percpu_write_lock(p2m_percpu_rwlock, &l->lock); - l->locker = get_processor_id(); - l->locker_function = func; -- l->unlock_level = __get_lock_level(); -- __set_lock_level(level); -+ l->unlock_level = _get_lock_level(); -+ _set_lock_level(level); - } - l->recurse_count++; - } -@@ -134,13 +137,13 @@ static inline void mm_write_unlock(mm_rwlock_t *l) - return; - l->locker = -1; - l->locker_function = "nobody"; -- __set_lock_level(l->unlock_level); -+ _set_lock_level(l->unlock_level); - percpu_write_unlock(p2m_percpu_rwlock, &l->lock); - } - - static inline void _mm_read_lock(mm_rwlock_t *l, int level) - { -- __check_lock_level(level); -+ _check_lock_level(level); - percpu_read_lock(p2m_percpu_rwlock, &l->lock); - /* There's nowhere to store the per-CPU unlock level so we can't - * set the lock level. */ -@@ -181,7 +184,7 @@ static inline void mm_unlock(mm_lock_t *l) - if ( l->lock.recurse_cnt == 1 ) - { - l->locker_function = "nobody"; -- __set_lock_level(l->unlock_level); -+ _set_lock_level(l->unlock_level); - } - spin_unlock_recursive(&l->lock); - } -@@ -194,10 +197,10 @@ static inline void mm_enforce_order_unlock(int unlock_level, - BUG_ON(*recurse_count == 0); - if ( (*recurse_count)-- == 1 ) - { -- __set_lock_level(unlock_level); -+ _set_lock_level(unlock_level); - } - } else { -- __set_lock_level(unlock_level); -+ _set_lock_level(unlock_level); - } - } - -@@ -287,21 +290,24 @@ declare_mm_lock(altp2mlist) - - #define MM_LOCK_ORDER_altp2m 40 - declare_mm_rwlock(altp2m); --#define p2m_lock(p) \ -- do { \ -- if ( p2m_is_altp2m(p) ) \ -- mm_write_lock(altp2m, &(p)->lock); \ -- else \ -- mm_write_lock(p2m, &(p)->lock); \ -- (p)->defer_flush++; \ -- } while (0) --#define p2m_unlock(p) \ -- do { \ -- if ( --(p)->defer_flush == 0 ) \ -- p2m_unlock_and_tlb_flush(p); \ -- else \ -- mm_write_unlock(&(p)->lock); \ -- } while (0) -+ -+static inline void p2m_lock(struct p2m_domain *p) -+{ -+ if ( p2m_is_altp2m(p) ) -+ mm_write_lock(altp2m, &p->lock); -+ else -+ mm_write_lock(p2m, &p->lock); -+ p->defer_flush++; -+} -+ -+static inline void p2m_unlock(struct p2m_domain *p) -+{ -+ if ( --p->defer_flush == 0 ) -+ p2m_unlock_and_tlb_flush(p); -+ else -+ mm_write_unlock(&p->lock); -+} -+ - #define gfn_lock(p,g,o) p2m_lock(p) - #define gfn_unlock(p,g,o) p2m_unlock(p) - #define p2m_read_lock(p) mm_read_lock(p2m, &(p)->lock) --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/0002-x86-mtrr-split-enabled-field-into-two-boolean-flags.patch b/emulators/xen-kernel/files/0002-x86-mtrr-split-enabled-field-into-two-boolean-flags.patch deleted file mode 100644 index 1ae66a2de00..00000000000 --- a/emulators/xen-kernel/files/0002-x86-mtrr-split-enabled-field-into-two-boolean-flags.patch +++ /dev/null @@ -1,198 +0,0 @@ -From 8ebc60e0274b770743e59256f665789d4308b188 Mon Sep 17 00:00:00 2001 -From: Jan Beulich -Date: Mon, 16 Jul 2018 15:09:12 +0200 -Subject: [PATCH 2/7] x86/mtrr: split "enabled" field into two boolean flags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The code hopefully is more readable this way. - -Also switch have_fixed to bool, seeing that it already is used as a -boolean. - -Signed-off-by: Jan Beulich -[switched to use MASK_*] -Signed-off-by: Roger Pau Monné ---- - xen/arch/x86/cpu/mtrr/generic.c | 14 +++++++++----- - xen/arch/x86/hvm/hvm.c | 6 ++++-- - xen/arch/x86/hvm/mtrr.c | 23 ++++++++++++++--------- - xen/include/asm-x86/msr-index.h | 2 ++ - xen/include/asm-x86/mtrr.h | 5 +++-- - 5 files changed, 32 insertions(+), 18 deletions(-) - -diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c -index 7ba0c3f0fe..09763654be 100644 ---- a/xen/arch/x86/cpu/mtrr/generic.c -+++ b/xen/arch/x86/cpu/mtrr/generic.c -@@ -80,7 +80,8 @@ void __init get_mtrr_state(void) - - rdmsrl(MSR_MTRRdefType, msr_content); - mtrr_state.def_type = (msr_content & 0xff); -- mtrr_state.enabled = (msr_content & 0xc00) >> 10; -+ mtrr_state.enabled = MASK_EXTR(msr_content, MTRRdefType_E); -+ mtrr_state.fixed_enabled = MASK_EXTR(msr_content, MTRRdefType_FE); - - /* Store mtrr_cap for HVM MTRR virtualisation. */ - rdmsrl(MSR_MTRRcap, mtrr_state.mtrr_cap); -@@ -159,7 +160,7 @@ static void __init print_mtrr_state(const char *level) - unsigned int base = 0, step = 0x10000; - - printk("%sMTRR fixed ranges %sabled:\n", level, -- mtrr_state.enabled & 1 ? "en" : "dis"); -+ mtrr_state.fixed_enabled ? "en" : "dis"); - for (; block->ranges; ++block, step >>= 2) { - for (i = 0; i < block->ranges; ++i, fr += 8) { - print_fixed(base, step, fr, level); -@@ -169,7 +170,7 @@ static void __init print_mtrr_state(const char *level) - print_fixed_last(level); - } - printk("%sMTRR variable ranges %sabled:\n", level, -- mtrr_state.enabled & 2 ? "en" : "dis"); -+ mtrr_state.enabled ? "en" : "dis"); - width = (paddr_bits - PAGE_SHIFT + 3) / 4; - - for (i = 0; i < num_var_ranges; ++i) { -@@ -383,8 +384,11 @@ static unsigned long set_mtrr_state(void) - /* Set_mtrr_restore restores the old value of MTRRdefType, - so to set it we fiddle with the saved value */ - if ((deftype & 0xff) != mtrr_state.def_type -- || ((deftype & 0xc00) >> 10) != mtrr_state.enabled) { -- deftype = (deftype & ~0xcff) | mtrr_state.def_type | (mtrr_state.enabled << 10); -+ || MASK_EXTR(deftype, MTRRdefType_E) != mtrr_state.enabled -+ || MASK_EXTR(deftype, MTRRdefType_FE) != mtrr_state.fixed_enabled) { -+ deftype = (deftype & ~0xcff) | mtrr_state.def_type | -+ MASK_INSR(mtrr_state.enabled, MTRRdefType_E) | -+ MASK_INSR(mtrr_state.fixed_enabled, MTRRdefType_FE); - change_mask |= MTRR_CHANGE_MASK_DEFTYPE; - } - -diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c -index e022f5ab0e..3e2abeb274 100644 ---- a/xen/arch/x86/hvm/hvm.c -+++ b/xen/arch/x86/hvm/hvm.c -@@ -3453,8 +3453,10 @@ int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) - case MSR_MTRRdefType: - if ( !d->arch.cpuid->basic.mtrr ) - goto gp_fault; -- *msr_content = v->arch.hvm_vcpu.mtrr.def_type -- | (v->arch.hvm_vcpu.mtrr.enabled << 10); -+ *msr_content = v->arch.hvm_vcpu.mtrr.def_type | -+ MASK_INSR(v->arch.hvm_vcpu.mtrr.enabled, MTRRdefType_E) | -+ MASK_INSR(v->arch.hvm_vcpu.mtrr.fixed_enabled, -+ MTRRdefType_FE); - break; - case MSR_MTRRfix64K_00000: - if ( !d->arch.cpuid->basic.mtrr ) -diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c -index a636012388..d74b363851 100644 ---- a/xen/arch/x86/hvm/mtrr.c -+++ b/xen/arch/x86/hvm/mtrr.c -@@ -195,11 +195,11 @@ static int get_mtrr_type(const struct mtrr_state *m, - uint64_t mask = -(uint64_t)PAGE_SIZE << order; - unsigned int seg, num_var_ranges = MASK_EXTR(m->mtrr_cap, MTRRcap_VCNT); - -- if ( unlikely(!(m->enabled & 0x2)) ) -+ if ( unlikely(!m->enabled) ) - return MTRR_TYPE_UNCACHABLE; - - pa &= mask; -- if ( (pa < 0x100000) && (m->enabled & 1) ) -+ if ( (pa < 0x100000) && m->fixed_enabled ) - { - /* Fixed range MTRR takes effect. */ - uint32_t addr = (uint32_t)pa, index; -@@ -391,7 +391,8 @@ bool_t mtrr_def_type_msr_set(struct domain *d, struct mtrr_state *m, - uint64_t msr_content) - { - uint8_t def_type = msr_content & 0xff; -- uint8_t enabled = (msr_content >> 10) & 0x3; -+ bool fixed_enabled = MASK_EXTR(msr_content, MTRRdefType_FE); -+ bool enabled = MASK_EXTR(msr_content, MTRRdefType_E); - - if ( unlikely(!valid_mtrr_type(def_type)) ) - { -@@ -406,10 +407,12 @@ bool_t mtrr_def_type_msr_set(struct domain *d, struct mtrr_state *m, - return 0; - } - -- if ( m->enabled != enabled || m->def_type != def_type ) -+ if ( m->enabled != enabled || m->fixed_enabled != fixed_enabled || -+ m->def_type != def_type ) - { - m->enabled = enabled; - m->def_type = def_type; -+ m->fixed_enabled = fixed_enabled; - memory_type_changed(d); - } - -@@ -478,10 +481,10 @@ bool mtrr_pat_not_equal(const struct vcpu *vd, const struct vcpu *vs) - const struct mtrr_state *md = &vd->arch.hvm_vcpu.mtrr; - const struct mtrr_state *ms = &vs->arch.hvm_vcpu.mtrr; - -- if ( (md->enabled ^ ms->enabled) & 2 ) -+ if ( md->enabled != ms->enabled ) - return true; - -- if ( md->enabled & 2 ) -+ if ( md->enabled ) - { - unsigned int num_var_ranges = MASK_EXTR(md->mtrr_cap, MTRRcap_VCNT); - -@@ -490,10 +493,10 @@ bool mtrr_pat_not_equal(const struct vcpu *vd, const struct vcpu *vs) - return true; - - /* Test fixed ranges. */ -- if ( (md->enabled ^ ms->enabled) & 1 ) -+ if ( md->fixed_enabled != ms->fixed_enabled ) - return true; - -- if ( (md->enabled & 1) && -+ if ( md->fixed_enabled && - memcmp(md->fixed_ranges, ms->fixed_ranges, - sizeof(md->fixed_ranges)) ) - return true; -@@ -681,7 +684,9 @@ static int hvm_save_mtrr_msr(struct domain *d, hvm_domain_context_t *h) - const struct mtrr_state *mtrr_state = &v->arch.hvm_vcpu.mtrr; - struct hvm_hw_mtrr hw_mtrr = { - .msr_mtrr_def_type = mtrr_state->def_type | -- (mtrr_state->enabled << 10), -+ MASK_INSR(mtrr_state->fixed_enabled, -+ MTRRdefType_FE) | -+ MASK_INSR(mtrr_state->enabled, MTRRdefType_E), - .msr_mtrr_cap = mtrr_state->mtrr_cap, - }; - unsigned int i; -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 95bb66916c..94bccf73a1 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -98,6 +98,8 @@ - #define MSR_MTRRfix4K_F0000 0x0000026e - #define MSR_MTRRfix4K_F8000 0x0000026f - #define MSR_MTRRdefType 0x000002ff -+#define MTRRdefType_FE (1u << 10) -+#define MTRRdefType_E (1u << 11) - - #define MSR_IA32_DEBUGCTLMSR 0x000001d9 - #define IA32_DEBUGCTLMSR_LBR (1<<0) /* Last Branch Record */ -diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h -index 5cdc5d4fe3..b1f7af6396 100644 ---- a/xen/include/asm-x86/mtrr.h -+++ b/xen/include/asm-x86/mtrr.h -@@ -50,8 +50,9 @@ struct mtrr_var_range { - struct mtrr_state { - struct mtrr_var_range *var_ranges; - mtrr_type fixed_ranges[NUM_FIXED_RANGES]; -- unsigned char enabled; -- unsigned char have_fixed; -+ bool enabled; -+ bool fixed_enabled; -+ bool have_fixed; - mtrr_type def_type; - - u64 mtrr_cap; --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0003-hvm-mtrr-add-emacs-local-variables-block-with-format.patch b/emulators/xen-kernel/files/0003-hvm-mtrr-add-emacs-local-variables-block-with-format.patch deleted file mode 100644 index f94363b1f02..00000000000 --- a/emulators/xen-kernel/files/0003-hvm-mtrr-add-emacs-local-variables-block-with-format.patch +++ /dev/null @@ -1,35 +0,0 @@ -From de3b31312248646394a78b837b8a02f2483cad02 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Mon, 16 Jul 2018 15:09:50 +0200 -Subject: [PATCH 3/7] hvm/mtrr: add emacs local variables block with formatting - info -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Roger Pau Monné ---- - xen/arch/x86/hvm/mtrr.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c -index d74b363851..7db0d473e8 100644 ---- a/xen/arch/x86/hvm/mtrr.c -+++ b/xen/arch/x86/hvm/mtrr.c -@@ -871,3 +871,13 @@ int epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, - - return MTRR_TYPE_UNCACHABLE; - } -+ -+/* -+ * Local variables: -+ * mode: C -+ * c-file-style: "BSD" -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * indent-tabs-mode: nil -+ * End: -+ */ --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0003-x86-mm-locks-apply-a-bias-to-lock-levels-for-control.patch b/emulators/xen-kernel/files/0003-x86-mm-locks-apply-a-bias-to-lock-levels-for-control.patch deleted file mode 100644 index 4927a4fd7ce..00000000000 --- a/emulators/xen-kernel/files/0003-x86-mm-locks-apply-a-bias-to-lock-levels-for-control.patch +++ /dev/null @@ -1,319 +0,0 @@ -From efce89c1df5969486bef82eec05223a4a6522d2d Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Tue, 12 Mar 2019 12:25:21 +0100 -Subject: [PATCH 3/3] x86/mm-locks: apply a bias to lock levels for control - domain -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -paging_log_dirty_op function takes mm locks from a subject domain and -then attempts to perform copy to operations against the caller domain -in order to copy the result of the hypercall into the caller provided -buffer. - -This works fine when the caller is a non-paging domain, but triggers a -lock order panic when the caller is a paging domain due to the fact -that at the point where the copy to operation is performed the subject -domain paging lock is locked, and the copy operation requires -locking the caller p2m lock which has a lower level. - -Fix this limitation by adding a bias to the level of control domain mm -locks, so that the lower control domain mm lock always has a level -greater than the higher unprivileged domain lock level. This allows -locking the subject domain mm locks and then locking the control -domain mm locks, while keeping the same lock ordering and the changes -mostly confined to mm-locks.h. - -Note that so far only this flow (locking a subject domain locks and -then the control domain ones) has been identified, but not all -possible code paths have been inspected. Hence this solution attempts -to be a non-intrusive fix for the problem at hand, without discarding -further changes in the future if other valid code paths are found that -require more complex lock level ordering. - -Signed-off-by: Roger Pau Monné -Reviewed-by: George Dunlap ---- - xen/arch/x86/mm/mm-locks.h | 119 +++++++++++++++++++++++-------------- - xen/arch/x86/mm/p2m-pod.c | 5 +- - 2 files changed, 78 insertions(+), 46 deletions(-) - -diff --git a/xen/arch/x86/mm/mm-locks.h b/xen/arch/x86/mm/mm-locks.h -index d3497713e9..d6c073dc5c 100644 ---- a/xen/arch/x86/mm/mm-locks.h -+++ b/xen/arch/x86/mm/mm-locks.h -@@ -50,15 +50,35 @@ static inline int _get_lock_level(void) - return this_cpu(mm_lock_level); - } - -+#define MM_LOCK_ORDER_MAX 64 -+/* -+ * Return the lock level taking the domain bias into account. If the domain is -+ * privileged a bias of MM_LOCK_ORDER_MAX is applied to the lock level, so that -+ * mm locks that belong to a control domain can be acquired after having -+ * acquired mm locks of an unprivileged domain. -+ * -+ * This is required in order to use some hypercalls from a paging domain that -+ * take locks of a subject domain and then attempt to copy data to/from the -+ * caller domain. -+ */ -+static inline int _lock_level(const struct domain *d, int l) -+{ -+ ASSERT(l <= MM_LOCK_ORDER_MAX); -+ -+ return l + (d && is_control_domain(d) ? MM_LOCK_ORDER_MAX : 0); -+} -+ - /* - * If you see this crash, the numbers printed are order levels defined - * in this file. - */ --static inline void _check_lock_level(int l) -+static inline void _check_lock_level(const struct domain *d, int l) - { -- if ( unlikely(_get_lock_level() > l) ) -+ int lvl = _lock_level(d, l); -+ -+ if ( unlikely(_get_lock_level() > lvl) ) - { -- printk("mm locking order violation: %i > %i\n", _get_lock_level(), l); -+ printk("mm locking order violation: %i > %i\n", _get_lock_level(), lvl); - BUG(); - } - } -@@ -68,10 +88,11 @@ static inline void _set_lock_level(int l) - this_cpu(mm_lock_level) = l; - } - --static inline void _mm_lock(mm_lock_t *l, const char *func, int level, int rec) -+static inline void _mm_lock(const struct domain *d, mm_lock_t *l, -+ const char *func, int level, int rec) - { - if ( !((mm_locked_by_me(l)) && rec) ) -- _check_lock_level(level); -+ _check_lock_level(d, level); - spin_lock_recursive(&l->lock); - if ( l->lock.recurse_cnt == 1 ) - { -@@ -80,16 +101,17 @@ static inline void _mm_lock(mm_lock_t *l, const char *func, int level, int rec) - } - else if ( (unlikely(!rec)) ) - panic("mm lock already held by %s\n", l->locker_function); -- _set_lock_level(level); -+ _set_lock_level(_lock_level(d, level)); - } - --static inline void _mm_enforce_order_lock_pre(int level) -+static inline void _mm_enforce_order_lock_pre(const struct domain *d, int level) - { -- _check_lock_level(level); -+ _check_lock_level(d, level); - } - --static inline void _mm_enforce_order_lock_post(int level, int *unlock_level, -- unsigned short *recurse_count) -+static inline void _mm_enforce_order_lock_post(const struct domain *d, int level, -+ int *unlock_level, -+ unsigned short *recurse_count) - { - if ( recurse_count ) - { -@@ -100,7 +122,7 @@ static inline void _mm_enforce_order_lock_post(int level, int *unlock_level, - } else { - *unlock_level = _get_lock_level(); - } -- _set_lock_level(level); -+ _set_lock_level(_lock_level(d, level)); - } - - -@@ -117,16 +139,17 @@ static inline int mm_write_locked_by_me(mm_rwlock_t *l) - return (l->locker == get_processor_id()); - } - --static inline void _mm_write_lock(mm_rwlock_t *l, const char *func, int level) -+static inline void _mm_write_lock(const struct domain *d, mm_rwlock_t *l, -+ const char *func, int level) - { - if ( !mm_write_locked_by_me(l) ) - { -- _check_lock_level(level); -+ _check_lock_level(d, level); - percpu_write_lock(p2m_percpu_rwlock, &l->lock); - l->locker = get_processor_id(); - l->locker_function = func; - l->unlock_level = _get_lock_level(); -- _set_lock_level(level); -+ _set_lock_level(_lock_level(d, level)); - } - l->recurse_count++; - } -@@ -141,9 +164,10 @@ static inline void mm_write_unlock(mm_rwlock_t *l) - percpu_write_unlock(p2m_percpu_rwlock, &l->lock); - } - --static inline void _mm_read_lock(mm_rwlock_t *l, int level) -+static inline void _mm_read_lock(const struct domain *d, mm_rwlock_t *l, -+ int level) - { -- _check_lock_level(level); -+ _check_lock_level(d, level); - percpu_read_lock(p2m_percpu_rwlock, &l->lock); - /* There's nowhere to store the per-CPU unlock level so we can't - * set the lock level. */ -@@ -156,28 +180,32 @@ static inline void mm_read_unlock(mm_rwlock_t *l) - - /* This wrapper uses the line number to express the locking order below */ - #define declare_mm_lock(name) \ -- static inline void mm_lock_##name(mm_lock_t *l, const char *func, int rec)\ -- { _mm_lock(l, func, MM_LOCK_ORDER_##name, rec); } -+ static inline void mm_lock_##name(const struct domain *d, mm_lock_t *l, \ -+ const char *func, int rec) \ -+ { _mm_lock(d, l, func, MM_LOCK_ORDER_##name, rec); } - #define declare_mm_rwlock(name) \ -- static inline void mm_write_lock_##name(mm_rwlock_t *l, const char *func) \ -- { _mm_write_lock(l, func, MM_LOCK_ORDER_##name); } \ -- static inline void mm_read_lock_##name(mm_rwlock_t *l) \ -- { _mm_read_lock(l, MM_LOCK_ORDER_##name); } -+ static inline void mm_write_lock_##name(const struct domain *d, \ -+ mm_rwlock_t *l, const char *func) \ -+ { _mm_write_lock(d, l, func, MM_LOCK_ORDER_##name); } \ -+ static inline void mm_read_lock_##name(const struct domain *d, \ -+ mm_rwlock_t *l) \ -+ { _mm_read_lock(d, l, MM_LOCK_ORDER_##name); } - /* These capture the name of the calling function */ --#define mm_lock(name, l) mm_lock_##name(l, __func__, 0) --#define mm_lock_recursive(name, l) mm_lock_##name(l, __func__, 1) --#define mm_write_lock(name, l) mm_write_lock_##name(l, __func__) --#define mm_read_lock(name, l) mm_read_lock_##name(l) -+#define mm_lock(name, d, l) mm_lock_##name(d, l, __func__, 0) -+#define mm_lock_recursive(name, d, l) mm_lock_##name(d, l, __func__, 1) -+#define mm_write_lock(name, d, l) mm_write_lock_##name(d, l, __func__) -+#define mm_read_lock(name, d, l) mm_read_lock_##name(d, l) - - /* This wrapper is intended for "external" locks which do not use - * the mm_lock_t types. Such locks inside the mm code are also subject - * to ordering constraints. */ --#define declare_mm_order_constraint(name) \ -- static inline void mm_enforce_order_lock_pre_##name(void) \ -- { _mm_enforce_order_lock_pre(MM_LOCK_ORDER_##name); } \ -- static inline void mm_enforce_order_lock_post_##name( \ -- int *unlock_level, unsigned short *recurse_count) \ -- { _mm_enforce_order_lock_post(MM_LOCK_ORDER_##name, unlock_level, recurse_count); } \ -+#define declare_mm_order_constraint(name) \ -+ static inline void mm_enforce_order_lock_pre_##name(const struct domain *d) \ -+ { _mm_enforce_order_lock_pre(d, MM_LOCK_ORDER_##name); } \ -+ static inline void mm_enforce_order_lock_post_##name(const struct domain *d,\ -+ int *unlock_level, unsigned short *recurse_count) \ -+ { _mm_enforce_order_lock_post(d, MM_LOCK_ORDER_##name, unlock_level, \ -+ recurse_count); } - - static inline void mm_unlock(mm_lock_t *l) - { -@@ -221,7 +249,7 @@ static inline void mm_enforce_order_unlock(int unlock_level, - - #define MM_LOCK_ORDER_nestedp2m 8 - declare_mm_lock(nestedp2m) --#define nestedp2m_lock(d) mm_lock(nestedp2m, &(d)->arch.nested_p2m_lock) -+#define nestedp2m_lock(d) mm_lock(nestedp2m, d, &(d)->arch.nested_p2m_lock) - #define nestedp2m_unlock(d) mm_unlock(&(d)->arch.nested_p2m_lock) - - /* P2M lock (per-non-alt-p2m-table) -@@ -260,9 +288,10 @@ declare_mm_rwlock(p2m); - - #define MM_LOCK_ORDER_per_page_sharing 24 - declare_mm_order_constraint(per_page_sharing) --#define page_sharing_mm_pre_lock() mm_enforce_order_lock_pre_per_page_sharing() -+#define page_sharing_mm_pre_lock() \ -+ mm_enforce_order_lock_pre_per_page_sharing(NULL) - #define page_sharing_mm_post_lock(l, r) \ -- mm_enforce_order_lock_post_per_page_sharing((l), (r)) -+ mm_enforce_order_lock_post_per_page_sharing(NULL, (l), (r)) - #define page_sharing_mm_unlock(l, r) mm_enforce_order_unlock((l), (r)) - - /* Alternate P2M list lock (per-domain) -@@ -275,7 +304,8 @@ declare_mm_order_constraint(per_page_sharing) - - #define MM_LOCK_ORDER_altp2mlist 32 - declare_mm_lock(altp2mlist) --#define altp2m_list_lock(d) mm_lock(altp2mlist, &(d)->arch.altp2m_list_lock) -+#define altp2m_list_lock(d) mm_lock(altp2mlist, d, \ -+ &(d)->arch.altp2m_list_lock) - #define altp2m_list_unlock(d) mm_unlock(&(d)->arch.altp2m_list_lock) - - /* P2M lock (per-altp2m-table) -@@ -294,9 +324,9 @@ declare_mm_rwlock(altp2m); - static inline void p2m_lock(struct p2m_domain *p) - { - if ( p2m_is_altp2m(p) ) -- mm_write_lock(altp2m, &p->lock); -+ mm_write_lock(altp2m, p->domain, &p->lock); - else -- mm_write_lock(p2m, &p->lock); -+ mm_write_lock(p2m, p->domain, &p->lock); - p->defer_flush++; - } - -@@ -310,7 +340,7 @@ static inline void p2m_unlock(struct p2m_domain *p) - - #define gfn_lock(p,g,o) p2m_lock(p) - #define gfn_unlock(p,g,o) p2m_unlock(p) --#define p2m_read_lock(p) mm_read_lock(p2m, &(p)->lock) -+#define p2m_read_lock(p) mm_read_lock(p2m, (p)->domain, &(p)->lock) - #define p2m_read_unlock(p) mm_read_unlock(&(p)->lock) - #define p2m_locked_by_me(p) mm_write_locked_by_me(&(p)->lock) - #define gfn_locked_by_me(p,g) p2m_locked_by_me(p) -@@ -322,7 +352,7 @@ static inline void p2m_unlock(struct p2m_domain *p) - - #define MM_LOCK_ORDER_pod 48 - declare_mm_lock(pod) --#define pod_lock(p) mm_lock(pod, &(p)->pod.lock) -+#define pod_lock(p) mm_lock(pod, (p)->domain, &(p)->pod.lock) - #define pod_unlock(p) mm_unlock(&(p)->pod.lock) - #define pod_locked_by_me(p) mm_locked_by_me(&(p)->pod.lock) - -@@ -335,8 +365,9 @@ declare_mm_lock(pod) - - #define MM_LOCK_ORDER_page_alloc 56 - declare_mm_order_constraint(page_alloc) --#define page_alloc_mm_pre_lock() mm_enforce_order_lock_pre_page_alloc() --#define page_alloc_mm_post_lock(l) mm_enforce_order_lock_post_page_alloc(&(l), NULL) -+#define page_alloc_mm_pre_lock(d) mm_enforce_order_lock_pre_page_alloc(d) -+#define page_alloc_mm_post_lock(d, l) \ -+ mm_enforce_order_lock_post_page_alloc(d, &(l), NULL) - #define page_alloc_mm_unlock(l) mm_enforce_order_unlock((l), NULL) - - /* Paging lock (per-domain) -@@ -356,9 +387,9 @@ declare_mm_order_constraint(page_alloc) - - #define MM_LOCK_ORDER_paging 64 - declare_mm_lock(paging) --#define paging_lock(d) mm_lock(paging, &(d)->arch.paging.lock) -+#define paging_lock(d) mm_lock(paging, d, &(d)->arch.paging.lock) - #define paging_lock_recursive(d) \ -- mm_lock_recursive(paging, &(d)->arch.paging.lock) -+ mm_lock_recursive(paging, d, &(d)->arch.paging.lock) - #define paging_unlock(d) mm_unlock(&(d)->arch.paging.lock) - #define paging_locked_by_me(d) mm_locked_by_me(&(d)->arch.paging.lock) - -diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c -index 631e9aec33..725a2921d9 100644 ---- a/xen/arch/x86/mm/p2m-pod.c -+++ b/xen/arch/x86/mm/p2m-pod.c -@@ -34,9 +34,10 @@ - /* Enforce lock ordering when grabbing the "external" page_alloc lock */ - static inline void lock_page_alloc(struct p2m_domain *p2m) - { -- page_alloc_mm_pre_lock(); -+ page_alloc_mm_pre_lock(p2m->domain); - spin_lock(&(p2m->domain->page_alloc_lock)); -- page_alloc_mm_post_lock(p2m->domain->arch.page_alloc_unlock_level); -+ page_alloc_mm_post_lock(p2m->domain, -+ p2m->domain->arch.page_alloc_unlock_level); - } - - static inline void unlock_page_alloc(struct p2m_domain *p2m) --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/0004-hvm-mtrr-use-the-hardware-number-of-variable-ranges-.patch b/emulators/xen-kernel/files/0004-hvm-mtrr-use-the-hardware-number-of-variable-ranges-.patch deleted file mode 100644 index 8dc0d3a6acc..00000000000 --- a/emulators/xen-kernel/files/0004-hvm-mtrr-use-the-hardware-number-of-variable-ranges-.patch +++ /dev/null @@ -1,135 +0,0 @@ -From e520d9e144ac4766aaa7ce55f1c49191a5ddefc8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Mon, 16 Jul 2018 15:10:09 +0200 -Subject: [PATCH 4/7] hvm/mtrr: use the hardware number of variable ranges for - Dom0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Expand the size of the variable ranges array to match the size of the -underlying hardware, this is a preparatory change for copying the -hardware MTRR state for Dom0. - -Signed-off-by: Roger Pau Monné -Reviewed-by: Jan Beulich ---- - xen/arch/x86/hvm/hvm.c | 12 +++++++++--- - xen/arch/x86/hvm/mtrr.c | 31 +++++++++++++++++++++++++++++-- - xen/include/asm-x86/mtrr.h | 3 +++ - 3 files changed, 41 insertions(+), 5 deletions(-) - -diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c -index 3e2abeb274..c7eb943ed3 100644 ---- a/xen/arch/x86/hvm/hvm.c -+++ b/xen/arch/x86/hvm/hvm.c -@@ -3476,10 +3476,13 @@ int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) - index = msr - MSR_MTRRfix4K_C0000; - *msr_content = fixed_range_base[index + 3]; - break; -- case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT-1): -+ case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT_MAX - 1): - if ( !d->arch.cpuid->basic.mtrr ) - goto gp_fault; - index = msr - MSR_IA32_MTRR_PHYSBASE(0); -+ if ( (index / 2) >= -+ MASK_EXTR(v->arch.hvm_vcpu.mtrr.mtrr_cap, MTRRcap_VCNT) ) -+ goto gp_fault; - *msr_content = var_range_base[index]; - break; - -@@ -3637,10 +3640,13 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content, - index, msr_content) ) - goto gp_fault; - break; -- case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT-1): -+ case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT_MAX - 1): - if ( !d->arch.cpuid->basic.mtrr ) - goto gp_fault; -- if ( !mtrr_var_range_msr_set(v->domain, &v->arch.hvm_vcpu.mtrr, -+ index = msr - MSR_IA32_MTRR_PHYSBASE(0); -+ if ( ((index / 2) >= -+ MASK_EXTR(v->arch.hvm_vcpu.mtrr.mtrr_cap, MTRRcap_VCNT)) || -+ !mtrr_var_range_msr_set(v->domain, &v->arch.hvm_vcpu.mtrr, - msr, msr_content) ) - goto gp_fault; - break; -diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c -index 7db0d473e8..4021d972fe 100644 ---- a/xen/arch/x86/hvm/mtrr.c -+++ b/xen/arch/x86/hvm/mtrr.c -@@ -154,14 +154,26 @@ uint8_t pat_type_2_pte_flags(uint8_t pat_type) - int hvm_vcpu_cacheattr_init(struct vcpu *v) - { - struct mtrr_state *m = &v->arch.hvm_vcpu.mtrr; -+ unsigned int num_var_ranges = -+ is_hardware_domain(v->domain) ? MASK_EXTR(mtrr_state.mtrr_cap, -+ MTRRcap_VCNT) -+ : MTRR_VCNT; -+ -+ if ( num_var_ranges > MTRR_VCNT_MAX ) -+ { -+ ASSERT(is_hardware_domain(v->domain)); -+ printk("WARNING: limited Dom%u variable range MTRRs from %u to %u\n", -+ v->domain->domain_id, num_var_ranges, MTRR_VCNT_MAX); -+ num_var_ranges = MTRR_VCNT_MAX; -+ } - - memset(m, 0, sizeof(*m)); - -- m->var_ranges = xzalloc_array(struct mtrr_var_range, MTRR_VCNT); -+ m->var_ranges = xzalloc_array(struct mtrr_var_range, num_var_ranges); - if ( m->var_ranges == NULL ) - return -ENOMEM; - -- m->mtrr_cap = (1u << 10) | (1u << 8) | MTRR_VCNT; -+ m->mtrr_cap = (1u << 10) | (1u << 8) | num_var_ranges; - - v->arch.hvm_vcpu.pat_cr = - ((uint64_t)PAT_TYPE_WRBACK) | /* PAT0: WB */ -@@ -448,6 +460,12 @@ bool_t mtrr_var_range_msr_set( - uint64_t *var_range_base = (uint64_t*)m->var_ranges; - - index = msr - MSR_IA32_MTRR_PHYSBASE(0); -+ if ( (index / 2) >= MASK_EXTR(m->mtrr_cap, MTRRcap_VCNT) ) -+ { -+ ASSERT_UNREACHABLE(); -+ return 0; -+ } -+ - if ( var_range_base[index] == msr_content ) - return 1; - -@@ -691,6 +709,15 @@ static int hvm_save_mtrr_msr(struct domain *d, hvm_domain_context_t *h) - }; - unsigned int i; - -+ if ( MASK_EXTR(hw_mtrr.msr_mtrr_cap, MTRRcap_VCNT) > -+ (ARRAY_SIZE(hw_mtrr.msr_mtrr_var) / 2) ) -+ { -+ dprintk(XENLOG_G_ERR, -+ "HVM save: %pv: too many (%lu) variable range MTRRs\n", -+ v, MASK_EXTR(hw_mtrr.msr_mtrr_cap, MTRRcap_VCNT)); -+ return -EINVAL; -+ } -+ - hvm_get_guest_pat(v, &hw_mtrr.msr_pat_cr); - - for ( i = 0; i < MASK_EXTR(hw_mtrr.msr_mtrr_cap, MTRRcap_VCNT); i++ ) -diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h -index b1f7af6396..72d0690e28 100644 ---- a/xen/include/asm-x86/mtrr.h -+++ b/xen/include/asm-x86/mtrr.h -@@ -39,6 +39,9 @@ typedef u8 mtrr_type; - #define MTRR_PHYSBASE_SHIFT 12 - /* Number of variable range MSR pairs we emulate for HVM guests: */ - #define MTRR_VCNT 8 -+/* Maximum number of variable range MSR pairs if FE is supported. */ -+#define MTRR_VCNT_MAX ((MSR_MTRRfix64K_00000 - \ -+ MSR_IA32_MTRR_PHYSBASE(0)) / 2) - - struct mtrr_var_range { - uint64_t base; --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0005-hvm-mtrr-copy-hardware-state-for-Dom0.patch b/emulators/xen-kernel/files/0005-hvm-mtrr-copy-hardware-state-for-Dom0.patch deleted file mode 100644 index ab3b8c55027..00000000000 --- a/emulators/xen-kernel/files/0005-hvm-mtrr-copy-hardware-state-for-Dom0.patch +++ /dev/null @@ -1,59 +0,0 @@ -From d8b0840bb90711e93b6994e50c728bbbf0f012a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Mon, 16 Jul 2018 15:10:49 +0200 -Subject: [PATCH 5/7] hvm/mtrr: copy hardware state for Dom0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Copy the state found on the hardware when creating a PVH Dom0. Since -the memory map provided to a PVH Dom0 is based on the native one using -the same set of MTRR ranges should provide Dom0 with a sane MTRR state -without having to manually build it in Xen. - -Signed-off-by: Roger Pau Monné -Reviewed-by: Jan Beulich ---- - xen/arch/x86/hvm/mtrr.c | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - -diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c -index 4021d972fe..2b00993a7b 100644 ---- a/xen/arch/x86/hvm/mtrr.c -+++ b/xen/arch/x86/hvm/mtrr.c -@@ -185,6 +185,32 @@ int hvm_vcpu_cacheattr_init(struct vcpu *v) - ((uint64_t)PAT_TYPE_UC_MINUS << 48) | /* PAT6: UC- */ - ((uint64_t)PAT_TYPE_UNCACHABLE << 56); /* PAT7: UC */ - -+ if ( is_hardware_domain(v->domain) ) -+ { -+ /* Copy values from the host. */ -+ struct domain *d = v->domain; -+ unsigned int i; -+ -+ if ( mtrr_state.have_fixed ) -+ for ( i = 0; i < NUM_FIXED_MSR; i++ ) -+ mtrr_fix_range_msr_set(d, m, i, -+ ((uint64_t *)mtrr_state.fixed_ranges)[i]); -+ -+ for ( i = 0; i < num_var_ranges; i++ ) -+ { -+ mtrr_var_range_msr_set(d, m, MSR_IA32_MTRR_PHYSBASE(i), -+ mtrr_state.var_ranges[i].base); -+ mtrr_var_range_msr_set(d, m, MSR_IA32_MTRR_PHYSMASK(i), -+ mtrr_state.var_ranges[i].mask); -+ } -+ -+ mtrr_def_type_msr_set(d, m, -+ mtrr_state.def_type | -+ MASK_INSR(mtrr_state.fixed_enabled, -+ MTRRdefType_FE) | -+ MASK_INSR(mtrr_state.enabled, MTRRdefType_E)); -+ } -+ - return 0; - } - --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0006-libxc-pvh-set-default-MTRR-type-to-write-back.patch b/emulators/xen-kernel/files/0006-libxc-pvh-set-default-MTRR-type-to-write-back.patch deleted file mode 100644 index c9a09ca1a24..00000000000 --- a/emulators/xen-kernel/files/0006-libxc-pvh-set-default-MTRR-type-to-write-back.patch +++ /dev/null @@ -1,104 +0,0 @@ -From a1c1ae0b0f5b30b5b928e45349086ec00930bccf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Mon, 16 Jul 2018 15:11:22 +0200 -Subject: [PATCH 6/7] libxc/pvh: set default MTRR type to write-back -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -And enable MTRR. This allows to provide a sane initial MTRR state for -PVH DomUs. This will have to be expanded when pci-passthrough support -is added to PVH guests, so that MMIO regions of devices are set as -UC. - -Note that initial MTRR setup is done by hvmloader for HVM guests, -that's not used by PVH guests. - -Signed-off-by: Roger Pau Monné -Acked-by: Wei Liu ---- - tools/libxc/xc_dom_x86.c | 44 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - -diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c -index e33a28847d..d28ff4d7e9 100644 ---- a/tools/libxc/xc_dom_x86.c -+++ b/tools/libxc/xc_dom_x86.c -@@ -53,6 +53,9 @@ - #define X86_CR0_PE 0x01 - #define X86_CR0_ET 0x10 - -+#define MTRR_TYPE_WRBACK 6 -+#define MTRR_DEF_TYPE_ENABLE (1u << 11) -+ - #define SPECIALPAGE_PAGING 0 - #define SPECIALPAGE_ACCESS 1 - #define SPECIALPAGE_SHARING 2 -@@ -931,6 +934,20 @@ static int vcpu_x86_64(struct xc_dom_image *dom) - return rc; - } - -+const static void *hvm_get_save_record(const void *ctx, unsigned int type, -+ unsigned int instance) -+{ -+ const struct hvm_save_descriptor *header; -+ -+ for ( header = ctx; -+ header->typecode != HVM_SAVE_CODE(END); -+ ctx += sizeof(*header) + header->length, header = ctx ) -+ if ( header->typecode == type && header->instance == instance ) -+ return ctx + sizeof(*header); -+ -+ return NULL; -+} -+ - static int vcpu_hvm(struct xc_dom_image *dom) - { - struct { -@@ -938,9 +955,12 @@ static int vcpu_hvm(struct xc_dom_image *dom) - HVM_SAVE_TYPE(HEADER) header; - struct hvm_save_descriptor cpu_d; - HVM_SAVE_TYPE(CPU) cpu; -+ struct hvm_save_descriptor mtrr_d; -+ HVM_SAVE_TYPE(MTRR) mtrr; - struct hvm_save_descriptor end_d; - HVM_SAVE_TYPE(END) end; - } bsp_ctx; -+ const HVM_SAVE_TYPE(MTRR) *mtrr_record; - uint8_t *full_ctx = NULL; - int rc; - -@@ -1014,6 +1034,30 @@ static int vcpu_hvm(struct xc_dom_image *dom) - if ( dom->start_info_seg.pfn ) - bsp_ctx.cpu.rbx = dom->start_info_seg.pfn << PAGE_SHIFT; - -+ /* Set the MTRR. */ -+ bsp_ctx.mtrr_d.typecode = HVM_SAVE_CODE(MTRR); -+ bsp_ctx.mtrr_d.instance = 0; -+ bsp_ctx.mtrr_d.length = HVM_SAVE_LENGTH(MTRR); -+ -+ mtrr_record = hvm_get_save_record(full_ctx, HVM_SAVE_CODE(MTRR), 0); -+ if ( !mtrr_record ) -+ { -+ xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, -+ "%s: unable to get MTRR save record", __func__); -+ goto out; -+ } -+ -+ memcpy(&bsp_ctx.mtrr, mtrr_record, sizeof(bsp_ctx.mtrr)); -+ -+ /* TODO: maybe this should be a firmware option instead? */ -+ if ( !dom->device_model ) -+ /* -+ * Enable MTRR, set default type to WB. -+ * TODO: add MMIO areas as UC when passthrough is supported. -+ */ -+ bsp_ctx.mtrr.msr_mtrr_def_type = MTRR_TYPE_WRBACK | -+ MTRR_DEF_TYPE_ENABLE; -+ - /* Set the end descriptor. */ - bsp_ctx.end_d.typecode = HVM_SAVE_CODE(END); - bsp_ctx.end_d.instance = 0; --- -2.18.0 - diff --git a/emulators/xen-kernel/files/0007-docs-pvh-document-initial-MTRR-state.patch b/emulators/xen-kernel/files/0007-docs-pvh-document-initial-MTRR-state.patch deleted file mode 100644 index 4be6edb9cdd..00000000000 --- a/emulators/xen-kernel/files/0007-docs-pvh-document-initial-MTRR-state.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 565efbc8a7145c47379543edfcc84fc4f4dd6d83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Mon, 16 Jul 2018 15:11:42 +0200 -Subject: [PATCH 7/7] docs/pvh: document initial MTRR state -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Provided to both Dom0 and DomUs. - -Signed-off-by: Roger Pau Monné ---- - docs/misc/pvh.markdown | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/docs/misc/pvh.markdown b/docs/misc/pvh.markdown -index e85fb15374..1c9a00b48a 100644 ---- a/docs/misc/pvh.markdown -+++ b/docs/misc/pvh.markdown -@@ -92,3 +92,21 @@ event channels. Delivery of those interrupts can be configured in the same way - as HVM guests, check xen/include/public/hvm/params.h and - xen/include/public/hvm/hvm\_op.h for more information about available delivery - methods. -+ -+## MTRR ## -+ -+### Unprivileged guests ### -+ -+PVH guests are currently booted with the default MTRR type set to write-back -+and MTRR enabled. This allows DomUs to start with a sane MTRR state. Note that -+this will have to be revisited when pci-passthrough is added to PVH in order to -+set MMIO regions as UC. -+ -+Xen guarantees that RAM regions will always have the WB cache type set in the -+initial MTRR state, either set by the default MTRR type or by other means. -+ -+### Hardware domain ### -+ -+A PVH hardware domain is booted with the same MTRR state as the one found on -+the host. This is done because the hardware domain memory map is already a -+modified copy of the host memory map, so the same MTRR setup should work. --- -2.18.0 - diff --git a/emulators/xen-kernel/files/xen.4th b/emulators/xen-kernel/files/xen.4th deleted file mode 100644 index a74d03c28e9..00000000000 --- a/emulators/xen-kernel/files/xen.4th +++ /dev/null @@ -1,99 +0,0 @@ -\ Copyright (c) 2015 Devin Teske -\ All rights reserved. -\ -\ Redistribution and use in source and binary forms, with or without -\ modification, are permitted provided that the following conditions -\ are met: -\ 1. Redistributions of source code must retain the above copyright -\ notice, this list of conditions and the following disclaimer. -\ 2. Redistributions in binary form must reproduce the above copyright -\ notice, this list of conditions and the following disclaimer in the -\ documentation and/or other materials provided with the distribution. -\ -\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -\ SUCH DAMAGE. -\ -\ $FreeBSD$ - -create xenkerndefault 64 allot -0 xenkerndefault c! - -also menu-command-helpers -also menu-namespace - -: init_xen_active ( N -- N ) - s" [X]en Kernel.. off" 2 pick menu_caption[x] setenv - s" [X]en Kernel.. On" 2 pick toggled_text[x] setenv - s" toggle_xen" 2 pick menu_command[x] setenv - s" 120" 2 pick menu_keycode[x] setenv - s" ^[1mX^[men Kernel.. ^[34;1mOff^[m" 2 pick ansi_caption[x] setenv - s" ^[1mX^[men Kernel.. ^[32;7mOn^[m" 2 pick toggled_ansi[x] setenv -; - -: init_xen_inactive ( N -- N ) - s" Xen Kernel.. N/A" 2dup - 4 pick menu_caption[x] setenv - 2 pick ansi_caption[x] setenv - s" true" 2 pick menu_command[x] setenv -; - -: init_xen ( -- ) - s" optionsmenu_options" getenv 0> if - c@ dup [char] 0 > over [char] 9 < and false = if - drop [char] 0 - then - 1+ - else - [char] 1 - then - begin - dup [char] 8 > if - false ( break ) - else - dup s" optionsmenu_caption[x]" 20 +c! getenv -1 = if - false ( break ) - else - drop true - then - then - while - 1+ - repeat - - s" xen_kernel" getenv dup -1 <> over 0> and if - xenkerndefault 1+ 0 2swap strcat swap 1- c! - init_xen_active ( n -- n ) - toggle_menuitem ( n -- n ) - else - drop - xenkerndefault c@ 0<> if - init_xen_active ( n -- n ) - else - init_xen_inactive ( n -- n ) - then - then -; - -: toggle_xen ( N -- N TRUE ) - toggle_menuitem ( n -- n ) - menu-redraw - - dup toggle_stateN @ 0= if - s" xen_kernel" unsetenv - else - xenkerndefault count s" xen_kernel" setenv - then - - TRUE \ loop menu again -; - -set optionsmenu_init="$optionsmenu_init init_xen" diff --git a/emulators/xen-kernel/files/xsa284.patch b/emulators/xen-kernel/files/xsa284.patch deleted file mode 100644 index 0b5dcd0f029..00000000000 --- a/emulators/xen-kernel/files/xsa284.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Jan Beulich -Subject: gnttab: set page refcount for copy-on-grant-transfer - -Commit 5cc77f9098 ("32-on-64: Fix domain address-size clamping, -implement"), which introduced this functionality, took care of clearing -the old page's PGC_allocated, but failed to set the bit (and install the -associated reference) on the newly allocated one. Furthermore the "mfn" -local variable was never updated, and hence the wrong MFN was passed to -guest_physmap_add_page() (and back to the destination domain) in this -case, leading to an IOMMU mapping into an unowned page. - -Ideally the code would use assign_pages(), but the call to -gnttab_prepare_for_transfer() sits in the middle of the actions -mirroring that function. - -This is XSA-284. - -Signed-off-by: Jan Beulich -Acked-by: George Dunlap - ---- a/xen/common/grant_table.c -+++ b/xen/common/grant_table.c -@@ -2183,6 +2183,8 @@ gnttab_transfer( - page->count_info &= ~(PGC_count_mask|PGC_allocated); - free_domheap_page(page); - page = new_page; -+ page->count_info = PGC_allocated | 1; -+ mfn = page_to_mfn(page); - } - - spin_lock(&e->page_alloc_lock); diff --git a/emulators/xen-kernel/files/xsa287-4.11.patch b/emulators/xen-kernel/files/xsa287-4.11.patch deleted file mode 100644 index 8563560e151..00000000000 --- a/emulators/xen-kernel/files/xsa287-4.11.patch +++ /dev/null @@ -1,328 +0,0 @@ -From 67620c1ccb13f7b58645f48248ba1f408b021fdc Mon Sep 17 00:00:00 2001 -From: George Dunlap -Date: Fri, 18 Jan 2019 15:00:34 +0000 -Subject: [PATCH] steal_page: Get rid of bogus struct page states - -The original rules for `struct page` required the following invariants -at all times: - -- refcount > 0 implies owner != NULL -- PGC_allocated implies refcount > 0 - -steal_page, in a misguided attempt to protect against unknown races, -violates both of these rules, thus introducing other races: - -- Temporarily, the count_info has the refcount go to 0 while - PGC_allocated is set - -- It explicitly returns the page PGC_allocated set, but owner == NULL - and page not on the page_list. - -The second one meant that page_get_owner_and_reference() could return -NULL even after having successfully grabbed a reference on the page, -leading the caller to leak the reference (since "couldn't get ref" and -"got ref but no owner" look the same). - -Furthermore, rather than grabbing a page reference to ensure that the -owner doesn't change under its feet, it appears to rely on holding -d->page_alloc lock to prevent this. - -Unfortunately, this is ineffective: page->owner remains non-NULL for -some time after the count has been set to 0; meaning that it would be -entirely possible for the page to be freed and re-allocated to a -different domain between the page_get_owner() check and the count_info -check. - -Modify steal_page to instead follow the appropriate access discipline, -taking the page through series of states similar to being freed and -then re-allocated with MEMF_no_owner: - -- Grab an extra reference to make sure we don't race with anyone else - freeing the page - -- Drop both references and PGC_allocated atomically, so that (if -successful), anyone else trying to grab a reference will fail - -- Attempt to reset Xen's mappings - -- Reset the rest of the state. - -Then, modify the two callers appropriately: - -- Leave count_info alone (it's already been cleared) -- Call free_domheap_page() directly if appropriate -- Call assign_pages() rather than open-coding a partial assign - -With all callers to assign_pages() now passing in pages with the -type_info field clear, tighten the respective assertion there. - -This is XSA-287. - -Signed-off-by: George Dunlap -Signed-off-by: Jan Beulich ---- - xen/arch/x86/mm.c | 84 ++++++++++++++++++++++++++++------------ - xen/common/grant_table.c | 20 +++++----- - xen/common/memory.c | 19 +++++---- - xen/common/page_alloc.c | 2 +- - 4 files changed, 83 insertions(+), 42 deletions(-) - -diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c -index 6509035a5c..d8ff58c901 100644 ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c -@@ -3966,70 +3966,106 @@ int donate_page( - return -EINVAL; - } - -+/* -+ * Steal page will attempt to remove `page` from domain `d`. Upon -+ * return, `page` will be in a state similar to the state of a page -+ * returned from alloc_domheap_page() with MEMF_no_owner set: -+ * - refcount 0 -+ * - type count cleared -+ * - owner NULL -+ * - page caching attributes cleaned up -+ * - removed from the domain's page_list -+ * -+ * If MEMF_no_refcount is not set, the domain's tot_pages will be -+ * adjusted. If this results in the page count falling to 0, -+ * put_domain() will be called. -+ * -+ * The caller should either call free_domheap_page() to free the -+ * page, or assign_pages() to put it back on some domain's page list. -+ */ - int steal_page( - struct domain *d, struct page_info *page, unsigned int memflags) - { - unsigned long x, y; - bool drop_dom_ref = false; -- const struct domain *owner = dom_xen; -+ const struct domain *owner; -+ int rc; - - if ( paging_mode_external(d) ) - return -EOPNOTSUPP; - -- spin_lock(&d->page_alloc_lock); -- -- if ( is_xen_heap_page(page) || ((owner = page_get_owner(page)) != d) ) -+ /* Grab a reference to make sure the page doesn't change under our feet */ -+ rc = -EINVAL; -+ if ( !(owner = page_get_owner_and_reference(page)) ) - goto fail; - -+ if ( owner != d || is_xen_heap_page(page) ) -+ goto fail_put; -+ - /* -- * We require there is just one reference (PGC_allocated). We temporarily -- * drop this reference now so that we can safely swizzle the owner. -+ * We require there are exactly two references -- the one we just -+ * took, and PGC_allocated. We temporarily drop both these -+ * references so that the page becomes effectively non-"live" for -+ * the domain. - */ - y = page->count_info; - do { - x = y; -- if ( (x & (PGC_count_mask|PGC_allocated)) != (1 | PGC_allocated) ) -- goto fail; -- y = cmpxchg(&page->count_info, x, x & ~PGC_count_mask); -+ if ( (x & (PGC_count_mask|PGC_allocated)) != (2 | PGC_allocated) ) -+ goto fail_put; -+ y = cmpxchg(&page->count_info, x, x & ~(PGC_count_mask|PGC_allocated)); - } while ( y != x ); - - /* -- * With the sole reference dropped temporarily, no-one can update type -- * information. Type count also needs to be zero in this case, but e.g. -- * PGT_seg_desc_page may still have PGT_validated set, which we need to -- * clear before transferring ownership (as validation criteria vary -- * depending on domain type). -+ * NB this is safe even if the page ends up being given back to -+ * the domain, because the count is zero: subsequent mappings will -+ * cause the cache attributes to be re-instated inside -+ * get_page_from_l1e(). -+ */ -+ if ( (rc = cleanup_page_cacheattr(page)) ) -+ { -+ /* -+ * Couldn't fixup Xen's mappings; put things the way we found -+ * it and return an error -+ */ -+ page->count_info |= PGC_allocated | 1; -+ goto fail; -+ } -+ -+ /* -+ * With the reference count now zero, nobody can grab references -+ * to do anything else with the page. Return the page to a state -+ * that it might be upon return from alloc_domheap_pages with -+ * MEMF_no_owner set. - */ -+ spin_lock(&d->page_alloc_lock); -+ - BUG_ON(page->u.inuse.type_info & (PGT_count_mask | PGT_locked | - PGT_pinned)); - page->u.inuse.type_info = 0; -- -- /* Swizzle the owner then reinstate the PGC_allocated reference. */ - page_set_owner(page, NULL); -- y = page->count_info; -- do { -- x = y; -- BUG_ON((x & (PGC_count_mask|PGC_allocated)) != PGC_allocated); -- } while ( (y = cmpxchg(&page->count_info, x, x | 1)) != x ); -+ page_list_del(page, &d->page_list); - - /* Unlink from original owner. */ - if ( !(memflags & MEMF_no_refcount) && !domain_adjust_tot_pages(d, -1) ) - drop_dom_ref = true; -- page_list_del(page, &d->page_list); - - spin_unlock(&d->page_alloc_lock); -+ - if ( unlikely(drop_dom_ref) ) - put_domain(d); -+ - return 0; - -+ fail_put: -+ put_page(page); - fail: -- spin_unlock(&d->page_alloc_lock); - gdprintk(XENLOG_WARNING, "Bad steal mfn %" PRI_mfn - " from d%d (owner d%d) caf=%08lx taf=%" PRtype_info "\n", - mfn_x(page_to_mfn(page)), d->domain_id, - owner ? owner->domain_id : DOMID_INVALID, - page->count_info, page->u.inuse.type_info); -- return -EINVAL; -+ return rc; - } - - static int __do_update_va_mapping( -diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c -index c0585d33f4..656fad1b42 100644 ---- a/xen/common/grant_table.c -+++ b/xen/common/grant_table.c -@@ -2179,7 +2179,7 @@ gnttab_transfer( - rcu_unlock_domain(e); - put_gfn_and_copyback: - put_gfn(d, gop.mfn); -- page->count_info &= ~(PGC_count_mask|PGC_allocated); -+ /* The count_info has already been cleaned */ - free_domheap_page(page); - goto copyback; - } -@@ -2202,10 +2202,9 @@ gnttab_transfer( - - copy_domain_page(page_to_mfn(new_page), mfn); - -- page->count_info &= ~(PGC_count_mask|PGC_allocated); -+ /* The count_info has already been cleared */ - free_domheap_page(page); - page = new_page; -- page->count_info = PGC_allocated | 1; - mfn = page_to_mfn(page); - } - -@@ -2245,12 +2244,17 @@ gnttab_transfer( - */ - spin_unlock(&e->page_alloc_lock); - okay = gnttab_prepare_for_transfer(e, d, gop.ref); -- spin_lock(&e->page_alloc_lock); - -- if ( unlikely(!okay) || unlikely(e->is_dying) ) -+ if ( unlikely(!okay || assign_pages(e, page, 0, MEMF_no_refcount)) ) - { -- bool_t drop_dom_ref = !domain_adjust_tot_pages(e, -1); -+ bool drop_dom_ref; - -+ /* -+ * Need to grab this again to safely free our "reserved" -+ * page in the page total -+ */ -+ spin_lock(&e->page_alloc_lock); -+ drop_dom_ref = !domain_adjust_tot_pages(e, -1); - spin_unlock(&e->page_alloc_lock); - - if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) -@@ -2263,10 +2267,6 @@ gnttab_transfer( - goto unlock_and_copyback; - } - -- page_list_add_tail(page, &e->page_list); -- page_set_owner(page, e); -- -- spin_unlock(&e->page_alloc_lock); - put_gfn(d, gop.mfn); - - TRACE_1D(TRC_MEM_PAGE_GRANT_TRANSFER, e->domain_id); -diff --git a/xen/common/memory.c b/xen/common/memory.c -index 4fb7962c79..f71163221f 100644 ---- a/xen/common/memory.c -+++ b/xen/common/memory.c -@@ -675,20 +675,22 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) - * Success! Beyond this point we cannot fail for this chunk. - */ - -- /* Destroy final reference to each input page. */ -+ /* -+ * These pages have already had owner and reference cleared. -+ * Do the final two steps: Remove from the physmap, and free -+ * them. -+ */ - while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - unsigned long gfn; - -- if ( !test_and_clear_bit(_PGC_allocated, &page->count_info) ) -- BUG(); - mfn = page_to_mfn(page); - gfn = mfn_to_gmfn(d, mfn_x(mfn)); - /* Pages were unshared above */ - BUG_ON(SHARED_M2P(gfn)); - if ( guest_physmap_remove_page(d, _gfn(gfn), mfn, 0) ) - domain_crash(d); -- put_page(page); -+ free_domheap_page(page); - } - - /* Assign each output page to the domain. */ -@@ -761,13 +763,16 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) - * chunks succeeded. - */ - fail: -- /* Reassign any input pages we managed to steal. */ -+ /* -+ * Reassign any input pages we managed to steal. NB that if the assign -+ * fails again, we're on the hook for freeing the page, since we've already -+ * cleared PGC_allocated. -+ */ - while ( (page = page_list_remove_head(&in_chunk_list)) ) - if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - { - BUG_ON(!d->is_dying); -- if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) -- put_page(page); -+ free_domheap_page(page); - } - - dying: -diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c -index 482f0988f7..52da7762e3 100644 ---- a/xen/common/page_alloc.c -+++ b/xen/common/page_alloc.c -@@ -2221,7 +2221,7 @@ int assign_pages( - for ( i = 0; i < (1 << order); i++ ) - { - ASSERT(page_get_owner(&pg[i]) == NULL); -- ASSERT((pg[i].count_info & ~(PGC_allocated | 1)) == 0); -+ ASSERT(!pg[i].count_info); - page_set_owner(&pg[i], d); - smp_wmb(); /* Domain pointer must be visible before updating refcnt. */ - pg[i].count_info = PGC_allocated | 1; --- -2.20.1 - diff --git a/emulators/xen-kernel/files/xsa290-4.11-1.patch b/emulators/xen-kernel/files/xsa290-4.11-1.patch deleted file mode 100644 index 38ddb56cf29..00000000000 --- a/emulators/xen-kernel/files/xsa290-4.11-1.patch +++ /dev/null @@ -1,237 +0,0 @@ -From: Jan Beulich -Subject: x86/mm: also allow L2 (un)validation to be preemptible - -Commit c612481d1c ("x86/mm: Plumbing to allow any PTE update to fail -with -ERESTART") added assertions next to the {alloc,free}_l2_table() -invocations to document (and validate in debug builds) that L2 -(un)validations are always preemptible. - -The assertion in free_page_type() was now observed to trigger when -recursive L2 page tables get cleaned up. - -In particular put_page_from_l2e()'s assumption that _put_page_type() -would always succeed is now wrong, resulting in a partially un-validated -page left in a domain, which has no other means of getting cleaned up -later on. If not causing any problems earlier, this would ultimately -trigger the check for ->u.inuse.type_info having a zero count when -freeing the page during cleanup after the domain has died. - -As a result it should be considered a mistake to not have extended -preemption fully to L2 when it was added to L3/L4 table handling, which -this change aims to correct. - -The validation side additions are done just for symmetry. - -This is part of XSA-290. - -Reported-by: Manuel Bouyer -Tested-by: Manuel Bouyer -Signed-off-by: Jan Beulich -Reviewed-by: Andrew Cooper - ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c -@@ -1126,7 +1126,7 @@ get_page_from_l1e( - define_get_linear_pagetable(l2); - static int - get_page_from_l2e( -- l2_pgentry_t l2e, unsigned long pfn, struct domain *d) -+ l2_pgentry_t l2e, unsigned long pfn, struct domain *d, int partial) - { - unsigned long mfn = l2e_get_pfn(l2e); - int rc; -@@ -1141,7 +1141,8 @@ get_page_from_l2e( - return -EINVAL; - } - -- rc = get_page_and_type_from_mfn(_mfn(mfn), PGT_l1_page_table, d, 0, 0); -+ rc = get_page_and_type_from_mfn(_mfn(mfn), PGT_l1_page_table, d, -+ partial, false); - if ( unlikely(rc == -EINVAL) && get_l2_linear_pagetable(l2e, pfn, d) ) - rc = 0; - -@@ -1295,8 +1296,11 @@ void put_page_from_l1e(l1_pgentry_t l1e, - * NB. Virtual address 'l2e' maps to a machine address within frame 'pfn'. - * Note also that this automatically deals correctly with linear p.t.'s. - */ --static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn) -+static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn, -+ int partial, bool defer) - { -+ int rc = 0; -+ - if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) || (l2e_get_pfn(l2e) == pfn) ) - return 1; - -@@ -1311,13 +1315,27 @@ static int put_page_from_l2e(l2_pgentry_ - else - { - struct page_info *pg = l2e_get_page(l2e); -- int rc = _put_page_type(pg, false, mfn_to_page(_mfn(pfn))); -+ struct page_info *ptpg = mfn_to_page(_mfn(pfn)); - -- ASSERT(!rc); -- put_page(pg); -+ if ( unlikely(partial > 0) ) -+ { -+ ASSERT(!defer); -+ rc = _put_page_type(pg, true, ptpg); -+ } -+ else if ( defer ) -+ { -+ current->arch.old_guest_ptpg = ptpg; -+ current->arch.old_guest_table = pg; -+ } -+ else -+ { -+ rc = _put_page_type(pg, true, ptpg); -+ if ( likely(!rc) ) -+ put_page(pg); -+ } - } - -- return 0; -+ return rc; - } - - static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn, -@@ -1487,11 +1505,12 @@ static int alloc_l2_table(struct page_in - unsigned long pfn = mfn_x(page_to_mfn(page)); - l2_pgentry_t *pl2e; - unsigned int i; -- int rc = 0; -+ int rc = 0, partial = page->partial_pte; - - pl2e = map_domain_page(_mfn(pfn)); - -- for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES; i++ ) -+ for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES; -+ i++, partial = 0 ) - { - if ( i > page->nr_validated_ptes && hypercall_preempt_check() ) - { -@@ -1501,23 +1520,33 @@ static int alloc_l2_table(struct page_in - } - - if ( !is_guest_l2_slot(d, type, i) || -- (rc = get_page_from_l2e(pl2e[i], pfn, d)) > 0 ) -+ (rc = get_page_from_l2e(pl2e[i], pfn, d, partial)) > 0 ) - continue; - -- if ( unlikely(rc == -ERESTART) ) -+ if ( rc == -ERESTART ) - { - page->nr_validated_ptes = i; -- break; -+ page->partial_pte = partial ?: 1; - } -- -- if ( rc < 0 ) -+ else if ( rc == -EINTR && i ) -+ { -+ page->nr_validated_ptes = i; -+ page->partial_pte = 0; -+ rc = -ERESTART; -+ } -+ else if ( rc < 0 && rc != -EINTR ) - { - gdprintk(XENLOG_WARNING, "Failure in alloc_l2_table: slot %#x\n", i); -- while ( i-- > 0 ) -- if ( is_guest_l2_slot(d, type, i) ) -- put_page_from_l2e(pl2e[i], pfn); -- break; -+ if ( i ) -+ { -+ page->nr_validated_ptes = i; -+ page->partial_pte = 0; -+ current->arch.old_guest_ptpg = NULL; -+ current->arch.old_guest_table = page; -+ } - } -+ if ( rc < 0 ) -+ break; - - pl2e[i] = adjust_guest_l2e(pl2e[i], d); - } -@@ -1797,28 +1826,50 @@ static int free_l2_table(struct page_inf - struct domain *d = page_get_owner(page); - unsigned long pfn = mfn_x(page_to_mfn(page)); - l2_pgentry_t *pl2e; -- unsigned int i = page->nr_validated_ptes - 1; -- int err = 0; -+ int rc = 0, partial = page->partial_pte; -+ unsigned int i = page->nr_validated_ptes - !partial; - - pl2e = map_domain_page(_mfn(pfn)); - -- ASSERT(page->nr_validated_ptes); -- do { -- if ( is_guest_l2_slot(d, page->u.inuse.type_info, i) && -- put_page_from_l2e(pl2e[i], pfn) == 0 && -- i && hypercall_preempt_check() ) -+ for ( ; ; ) -+ { -+ if ( is_guest_l2_slot(d, page->u.inuse.type_info, i) ) -+ rc = put_page_from_l2e(pl2e[i], pfn, partial, false); -+ if ( rc < 0 ) -+ break; -+ -+ partial = 0; -+ -+ if ( !i-- ) -+ break; -+ -+ if ( hypercall_preempt_check() ) - { -- page->nr_validated_ptes = i; -- err = -ERESTART; -+ rc = -EINTR; -+ break; - } -- } while ( !err && i-- ); -+ } - - unmap_domain_page(pl2e); - -- if ( !err ) -+ if ( rc >= 0 ) -+ { - page->u.inuse.type_info &= ~PGT_pae_xen_l2; -+ rc = 0; -+ } -+ else if ( rc == -ERESTART ) -+ { -+ page->nr_validated_ptes = i; -+ page->partial_pte = partial ?: -1; -+ } -+ else if ( rc == -EINTR && i < L2_PAGETABLE_ENTRIES - 1 ) -+ { -+ page->nr_validated_ptes = i + 1; -+ page->partial_pte = 0; -+ rc = -ERESTART; -+ } - -- return err; -+ return rc; - } - - static int free_l3_table(struct page_info *page) -@@ -2138,7 +2189,7 @@ static int mod_l2_entry(l2_pgentry_t *pl - return -EBUSY; - } - -- if ( unlikely((rc = get_page_from_l2e(nl2e, pfn, d)) < 0) ) -+ if ( unlikely((rc = get_page_from_l2e(nl2e, pfn, d, 0)) < 0) ) - return rc; - - nl2e = adjust_guest_l2e(nl2e, d); -@@ -2157,7 +2208,8 @@ static int mod_l2_entry(l2_pgentry_t *pl - return -EBUSY; - } - -- put_page_from_l2e(ol2e, pfn); -+ put_page_from_l2e(ol2e, pfn, 0, true); -+ - return rc; - } - diff --git a/emulators/xen-kernel/files/xsa290-4.11-2.patch b/emulators/xen-kernel/files/xsa290-4.11-2.patch deleted file mode 100644 index 9355e02f82f..00000000000 --- a/emulators/xen-kernel/files/xsa290-4.11-2.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Jan Beulich -Subject: x86/mm: add explicit preemption checks to L3 (un)validation - -When recursive page tables are used at the L3 level, unvalidation of a -single L4 table may incur unvalidation of two levels of L3 tables, i.e. -a maximum iteration count of 512^3 for unvalidating an L4 table. The -preemption check in free_l2_table() as well as the one in -_put_page_type() may never be reached, so explicit checking is needed in -free_l3_table(). - -When recursive page tables are used at the L4 level, the iteration count -at L4 alone is capped at 512^2. As soon as a present L3 entry is hit -which itself needs unvalidation (and hence requiring another nested loop -with 512 iterations), the preemption checks added here kick in, so no -further preemption checking is needed at L4 (until we decide to permit -5-level paging for PV guests). - -The validation side additions are done just for symmetry. - -This is part of XSA-290. - -Signed-off-by: Jan Beulich -Reviewed-by: Andrew Cooper - ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c -@@ -1581,6 +1581,13 @@ static int alloc_l3_table(struct page_in - for ( i = page->nr_validated_ptes; i < L3_PAGETABLE_ENTRIES; - i++, partial = 0 ) - { -+ if ( i > page->nr_validated_ptes && hypercall_preempt_check() ) -+ { -+ page->nr_validated_ptes = i; -+ rc = -ERESTART; -+ break; -+ } -+ - if ( is_pv_32bit_domain(d) && (i == 3) ) - { - if ( !(l3e_get_flags(pl3e[i]) & _PAGE_PRESENT) || -@@ -1882,15 +1889,25 @@ static int free_l3_table(struct page_inf - - pl3e = map_domain_page(_mfn(pfn)); - -- do { -+ for ( ; ; ) -+ { - rc = put_page_from_l3e(pl3e[i], pfn, partial, 0); - if ( rc < 0 ) - break; -+ - partial = 0; -- if ( rc > 0 ) -- continue; -- pl3e[i] = unadjust_guest_l3e(pl3e[i], d); -- } while ( i-- ); -+ if ( rc == 0 ) -+ pl3e[i] = unadjust_guest_l3e(pl3e[i], d); -+ -+ if ( !i-- ) -+ break; -+ -+ if ( hypercall_preempt_check() ) -+ { -+ rc = -EINTR; -+ break; -+ } -+ } - - unmap_domain_page(pl3e); - diff --git a/emulators/xen-kernel/files/xsa292.patch b/emulators/xen-kernel/files/xsa292.patch deleted file mode 100644 index 198fd4fdd4d..00000000000 --- a/emulators/xen-kernel/files/xsa292.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Jan Beulich -Subject: x86/mm: properly flush TLB in switch_cr3_cr4() - -The CR3 values used for contexts run with PCID enabled uniformly have -CR3.NOFLUSH set, resulting in the CR3 write itself to not cause any -flushing at all. When the second CR4 write is skipped or doesn't do any -flushing, there's nothing so far which would purge TLB entries which may -have accumulated again if the PCID doesn't change; the "just in case" -flush only affects the case where the PCID actually changes. (There may -be particularly many TLB entries re-accumulated in case of a watchdog -NMI kicking in during the critical time window.) - -Suppress the no-flush behavior of the CR3 write in this particular case. - -Similarly the second CR4 write may not cause any flushing of TLB entries -established again while the original PCID was still in use - it may get -performed because of unrelated bits changing. The flush of the old PCID -needs to happen nevertheless. - -At the same time also eliminate a possible race with lazy context -switch: Just like for CR4, CR3 may change at any time while interrupts -are enabled, due to the __sync_local_execstate() invocation from the -flush IPI handler. It is for that reason that the CR3 read, just like -the CR4 one, must happen only after interrupts have been turned off. - -This is XSA-292. - -Reported-by: Sergey Dyasli -Reported-by: Andrew Cooper -Tested-by: Sergey Dyasli -Signed-off-by: Jan Beulich -Reviewed-by: Andrew Cooper ---- -v3: Adjust comments. Drop old_cr4 from the PGE check in the expression - controlling the invocation of invpcid_flush_single_context(), as PGE - is always clear there. -v2: Decouple invpcid_flush_single_context() from 2nd CR4 write. - ---- a/xen/arch/x86/flushtlb.c -+++ b/xen/arch/x86/flushtlb.c -@@ -103,9 +103,8 @@ static void do_tlb_flush(void) - - void switch_cr3_cr4(unsigned long cr3, unsigned long cr4) - { -- unsigned long flags, old_cr4; -+ unsigned long flags, old_cr4, old_pcid; - u32 t; -- unsigned long old_pcid = cr3_pcid(read_cr3()); - - /* This non-reentrant function is sometimes called in interrupt context. */ - local_irq_save(flags); -@@ -133,15 +132,38 @@ void switch_cr3_cr4(unsigned long cr3, u - */ - invpcid_flush_all_nonglobals(); - -+ /* -+ * If we don't change PCIDs, the CR3 write below needs to flush this very -+ * PCID, even when a full flush was performed above, as we are currently -+ * accumulating TLB entries again from the old address space. -+ * NB: Clearing the bit when we don't use PCID is benign (as it is clear -+ * already in that case), but allows the if() to be more simple. -+ */ -+ old_pcid = cr3_pcid(read_cr3()); -+ if ( old_pcid == cr3_pcid(cr3) ) -+ cr3 &= ~X86_CR3_NOFLUSH; -+ - write_cr3(cr3); - - if ( old_cr4 != cr4 ) - write_cr4(cr4); -- else if ( old_pcid != cr3_pcid(cr3) ) -- /* -- * Make sure no TLB entries related to the old PCID created between -- * flushing the TLB and writing the new %cr3 value remain in the TLB. -- */ -+ -+ /* -+ * Make sure no TLB entries related to the old PCID created between -+ * flushing the TLB and writing the new %cr3 value remain in the TLB. -+ * -+ * The write to CR4 just above has performed a wider flush in certain -+ * cases, which therefore get excluded here. Since that write is -+ * conditional, note in particular that it won't be skipped if PCIDE -+ * transitions from 1 to 0. This is because the CR4 write further up will -+ * have been skipped in this case, as PCIDE and PGE won't both be set at -+ * the same time. -+ * -+ * Note also that PGE is always clear in old_cr4. -+ */ -+ if ( old_pcid != cr3_pcid(cr3) && -+ !(cr4 & X86_CR4_PGE) && -+ (old_cr4 & X86_CR4_PCIDE) <= (cr4 & X86_CR4_PCIDE) ) - invpcid_flush_single_context(old_pcid); - - post_flush(t); diff --git a/emulators/xen-kernel/files/xsa293-4.11-1.patch b/emulators/xen-kernel/files/xsa293-4.11-1.patch deleted file mode 100644 index 0b8499fbbb1..00000000000 --- a/emulators/xen-kernel/files/xsa293-4.11-1.patch +++ /dev/null @@ -1,317 +0,0 @@ -From: Andrew Cooper -Subject: x86/pv: Rewrite guest %cr4 handling from scratch - -The PV cr4 logic is almost impossible to follow, and leaks bits into guest -context which definitely shouldn't be visible (in particular, VMXE). - -The biggest problem however, and source of the complexity, is that it derives -new real and guest cr4 values from the current value in hardware - this is -context dependent and an inappropriate source of information. - -Rewrite the cr4 logic to be invariant of the current value in hardware. - -First of all, modify write_ptbase() to always use mmu_cr4_features for IDLE -and HVM contexts. mmu_cr4_features *is* the correct value to use, and makes -the ASSERT() obviously redundant. - -For PV guests, curr->arch.pv.ctrlreg[4] remains the guests view of cr4, but -all logic gets reworked in terms of this and mmu_cr4_features only. - -Two masks are introduced; bits which the guest has control over, and bits -which are forwarded from Xen's settings. One guest-visible change here is -that Xen's VMXE setting is no longer visible at all. - -pv_make_cr4() follows fairly closely from pv_guest_cr4_to_real_cr4(), but -deliberately starts with mmu_cr4_features, and only alters the minimal subset -of bits. - -The boot-time {compat_,}pv_cr4_mask variables are removed, as they are a -remnant of the pre-CPUID policy days. pv_fixup_guest_cr4() gains a related -derivation from the policy. - -Another guest visible change here is that a 32bit PV guest can now flip -FSGSBASE in its view of CR4. While the {RD,WR}{FS,GS}BASE instructions are -unusable outside of a 64bit code segment, the ability to modify FSGSBASE -matches real hardware behaviour, and avoids the need for any 32bit/64bit -differences in the logic. - -Overall, this patch shouldn't have a practical change in guest behaviour. -VMXE will disappear from view, and an inquisitive 32bit kernel can now see -FSGSBASE changing, but this new logic is otherwise bug-compatible with before. - -This is part of XSA-293 - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c -index b1e50d1..675152a 100644 ---- a/xen/arch/x86/domain.c -+++ b/xen/arch/x86/domain.c -@@ -733,49 +733,6 @@ int arch_domain_soft_reset(struct domain *d) - return ret; - } - --/* -- * These are the masks of CR4 bits (subject to hardware availability) which a -- * PV guest may not legitimiately attempt to modify. -- */ --static unsigned long __read_mostly pv_cr4_mask, compat_pv_cr4_mask; -- --static int __init init_pv_cr4_masks(void) --{ -- unsigned long common_mask = ~X86_CR4_TSD; -- -- /* -- * All PV guests may attempt to modify TSD, DE and OSXSAVE. -- */ -- if ( cpu_has_de ) -- common_mask &= ~X86_CR4_DE; -- if ( cpu_has_xsave ) -- common_mask &= ~X86_CR4_OSXSAVE; -- -- pv_cr4_mask = compat_pv_cr4_mask = common_mask; -- -- /* -- * 64bit PV guests may attempt to modify FSGSBASE. -- */ -- if ( cpu_has_fsgsbase ) -- pv_cr4_mask &= ~X86_CR4_FSGSBASE; -- -- return 0; --} --__initcall(init_pv_cr4_masks); -- --unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) --{ -- unsigned long hv_cr4 = real_cr4_to_pv_guest_cr4(read_cr4()); -- unsigned long mask = is_pv_32bit_vcpu(v) ? compat_pv_cr4_mask : pv_cr4_mask; -- -- if ( (guest_cr4 & mask) != (hv_cr4 & mask) ) -- printk(XENLOG_G_WARNING -- "d%d attempted to change %pv's CR4 flags %08lx -> %08lx\n", -- current->domain->domain_id, v, hv_cr4, guest_cr4); -- -- return (hv_cr4 & mask) | (guest_cr4 & ~mask); --} -- - #define xen_vcpu_guest_context vcpu_guest_context - #define fpu_ctxt fpu_ctxt.x - CHECK_FIELD_(struct, vcpu_guest_context, fpu_ctxt); -@@ -789,7 +746,7 @@ int arch_set_info_guest( - struct domain *d = v->domain; - unsigned long cr3_gfn; - struct page_info *cr3_page; -- unsigned long flags, cr4; -+ unsigned long flags; - unsigned int i; - int rc = 0, compat; - -@@ -978,9 +935,8 @@ int arch_set_info_guest( - v->arch.pv_vcpu.ctrlreg[0] &= X86_CR0_TS; - v->arch.pv_vcpu.ctrlreg[0] |= read_cr0() & ~X86_CR0_TS; - -- cr4 = v->arch.pv_vcpu.ctrlreg[4]; -- v->arch.pv_vcpu.ctrlreg[4] = cr4 ? pv_guest_cr4_fixup(v, cr4) : -- real_cr4_to_pv_guest_cr4(mmu_cr4_features); -+ v->arch.pv_vcpu.ctrlreg[4] = -+ pv_fixup_guest_cr4(v, v->arch.pv_vcpu.ctrlreg[4]); - - memset(v->arch.debugreg, 0, sizeof(v->arch.debugreg)); - for ( i = 0; i < 8; i++ ) -diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c -index 6509035..08634b7 100644 ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c -@@ -505,33 +505,13 @@ void make_cr3(struct vcpu *v, mfn_t mfn) - v->arch.cr3 |= get_pcid_bits(v, false); - } - --unsigned long pv_guest_cr4_to_real_cr4(const struct vcpu *v) --{ -- const struct domain *d = v->domain; -- unsigned long cr4; -- -- cr4 = v->arch.pv_vcpu.ctrlreg[4] & ~X86_CR4_DE; -- cr4 |= mmu_cr4_features & (X86_CR4_PSE | X86_CR4_SMEP | X86_CR4_SMAP | -- X86_CR4_OSXSAVE | X86_CR4_FSGSBASE); -- -- if ( d->arch.pv_domain.pcid ) -- cr4 |= X86_CR4_PCIDE; -- else if ( !d->arch.pv_domain.xpti ) -- cr4 |= X86_CR4_PGE; -- -- cr4 |= d->arch.vtsc ? X86_CR4_TSD : 0; -- -- return cr4; --} -- - void write_ptbase(struct vcpu *v) - { - struct cpu_info *cpu_info = get_cpu_info(); - unsigned long new_cr4; - - new_cr4 = (is_pv_vcpu(v) && !is_idle_vcpu(v)) -- ? pv_guest_cr4_to_real_cr4(v) -- : ((read_cr4() & ~(X86_CR4_PCIDE | X86_CR4_TSD)) | X86_CR4_PGE); -+ ? pv_make_cr4(v) : mmu_cr4_features; - - if ( is_pv_vcpu(v) && v->domain->arch.pv_domain.xpti ) - { -@@ -550,8 +530,6 @@ void write_ptbase(struct vcpu *v) - switch_cr3_cr4(v->arch.cr3, new_cr4); - cpu_info->pv_cr3 = 0; - } -- -- ASSERT(is_pv_vcpu(v) || read_cr4() == mmu_cr4_features); - } - - /* -diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c -index b75ff6b..3965959 100644 ---- a/xen/arch/x86/pv/domain.c -+++ b/xen/arch/x86/pv/domain.c -@@ -97,6 +97,52 @@ static void release_compat_l4(struct vcpu *v) - v->arch.guest_table_user = pagetable_null(); - } - -+unsigned long pv_fixup_guest_cr4(const struct vcpu *v, unsigned long cr4) -+{ -+ const struct cpuid_policy *p = v->domain->arch.cpuid; -+ -+ /* Discard attempts to set guest controllable bits outside of the policy. */ -+ cr4 &= ~((p->basic.tsc ? 0 : X86_CR4_TSD) | -+ (p->basic.de ? 0 : X86_CR4_DE) | -+ (p->feat.fsgsbase ? 0 : X86_CR4_FSGSBASE) | -+ (p->basic.xsave ? 0 : X86_CR4_OSXSAVE)); -+ -+ /* Masks expected to be disjoint sets. */ -+ BUILD_BUG_ON(PV_CR4_GUEST_MASK & PV_CR4_GUEST_VISIBLE_MASK); -+ -+ /* -+ * A guest sees the policy subset of its own choice of guest controllable -+ * bits, and a subset of Xen's choice of certain hardware settings. -+ */ -+ return ((cr4 & PV_CR4_GUEST_MASK) | -+ (mmu_cr4_features & PV_CR4_GUEST_VISIBLE_MASK)); -+} -+ -+unsigned long pv_make_cr4(const struct vcpu *v) -+{ -+ const struct domain *d = v->domain; -+ unsigned long cr4 = mmu_cr4_features & -+ ~(X86_CR4_PCIDE | X86_CR4_PGE | X86_CR4_TSD); -+ -+ /* -+ * PCIDE or PGE depends on the PCID/XPTI settings, but must not both be -+ * set, as it impacts the safety of TLB flushing. -+ */ -+ if ( d->arch.pv_domain.pcid ) -+ cr4 |= X86_CR4_PCIDE; -+ else if ( !d->arch.pv_domain.xpti ) -+ cr4 |= X86_CR4_PGE; -+ -+ /* -+ * TSD is needed if either the guest has elected to use it, or Xen is -+ * virtualising the TSC value the guest sees. -+ */ -+ if ( d->arch.vtsc || (v->arch.pv_vcpu.ctrlreg[4] & X86_CR4_TSD) ) -+ cr4 |= X86_CR4_TSD; -+ -+ return cr4; -+} -+ - int switch_compat(struct domain *d) - { - struct vcpu *v; -@@ -191,7 +237,7 @@ int pv_vcpu_initialise(struct vcpu *v) - /* PV guests by default have a 100Hz ticker. */ - v->periodic_period = MILLISECS(10); - -- v->arch.pv_vcpu.ctrlreg[4] = real_cr4_to_pv_guest_cr4(mmu_cr4_features); -+ v->arch.pv_vcpu.ctrlreg[4] = pv_fixup_guest_cr4(v, 0); - - if ( is_pv_32bit_domain(d) ) - { -diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c -index ce2ec76..4abbc14 100644 ---- a/xen/arch/x86/pv/emul-priv-op.c -+++ b/xen/arch/x86/pv/emul-priv-op.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -785,8 +786,8 @@ static int write_cr(unsigned int reg, unsigned long val, - } - - case 4: /* Write CR4 */ -- curr->arch.pv_vcpu.ctrlreg[4] = pv_guest_cr4_fixup(curr, val); -- write_cr4(pv_guest_cr4_to_real_cr4(curr)); -+ curr->arch.pv_vcpu.ctrlreg[4] = pv_fixup_guest_cr4(curr, val); -+ write_cr4(pv_make_cr4(curr)); - ctxt_switch_levelling(curr); - return X86EMUL_OKAY; - } -diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h -index ec81d78..c8aa8a5 100644 ---- a/xen/include/asm-x86/domain.h -+++ b/xen/include/asm-x86/domain.h -@@ -610,17 +610,6 @@ bool update_secondary_system_time(struct vcpu *, - void vcpu_show_execution_state(struct vcpu *); - void vcpu_show_registers(const struct vcpu *); - --/* Clean up CR4 bits that are not under guest control. */ --unsigned long pv_guest_cr4_fixup(const struct vcpu *, unsigned long guest_cr4); -- --/* Convert between guest-visible and real CR4 values. */ --unsigned long pv_guest_cr4_to_real_cr4(const struct vcpu *v); -- --#define real_cr4_to_pv_guest_cr4(c) \ -- ((c) & ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_TSD | \ -- X86_CR4_OSXSAVE | X86_CR4_SMEP | \ -- X86_CR4_FSGSBASE | X86_CR4_SMAP | X86_CR4_PCIDE)) -- - #define domain_max_vcpus(d) (is_hvm_domain(d) ? HVM_MAX_VCPUS : MAX_VIRT_CPUS) - - static inline struct vcpu_guest_context *alloc_vcpu_guest_context(void) -diff --git a/xen/include/asm-x86/pv/domain.h b/xen/include/asm-x86/pv/domain.h -index 4fea764..4e4710c 100644 ---- a/xen/include/asm-x86/pv/domain.h -+++ b/xen/include/asm-x86/pv/domain.h -@@ -59,6 +59,23 @@ int pv_vcpu_initialise(struct vcpu *v); - void pv_domain_destroy(struct domain *d); - int pv_domain_initialise(struct domain *d); - -+/* -+ * Bits which a PV guest can toggle in its view of cr4. Some are loaded into -+ * hardware, while some are fully emulated. -+ */ -+#define PV_CR4_GUEST_MASK \ -+ (X86_CR4_TSD | X86_CR4_DE | X86_CR4_FSGSBASE | X86_CR4_OSXSAVE) -+ -+/* Bits which a PV guest may observe from the real hardware settings. */ -+#define PV_CR4_GUEST_VISIBLE_MASK \ -+ (X86_CR4_PAE | X86_CR4_MCE | X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT) -+ -+/* Given a new cr4 value, construct the resulting guest-visible cr4 value. */ -+unsigned long pv_fixup_guest_cr4(const struct vcpu *v, unsigned long cr4); -+ -+/* Create a cr4 value to load into hardware, based on vcpu settings. */ -+unsigned long pv_make_cr4(const struct vcpu *v); -+ - #else /* !CONFIG_PV */ - - #include -@@ -68,6 +85,8 @@ static inline int pv_vcpu_initialise(struct vcpu *v) { return -EOPNOTSUPP; } - static inline void pv_domain_destroy(struct domain *d) {} - static inline int pv_domain_initialise(struct domain *d) { return -EOPNOTSUPP; } - -+static inline unsigned long pv_make_cr4(const struct vcpu *v) { return ~0ul; } -+ - #endif /* CONFIG_PV */ - - void paravirt_ctxt_switch_from(struct vcpu *v); diff --git a/emulators/xen-kernel/files/xsa293-4.11-2.patch b/emulators/xen-kernel/files/xsa293-4.11-2.patch deleted file mode 100644 index a005021b148..00000000000 --- a/emulators/xen-kernel/files/xsa293-4.11-2.patch +++ /dev/null @@ -1,260 +0,0 @@ -From: Andrew Cooper -Subject: x86/pv: Don't have %cr4.fsgsbase active behind a guest kernels back - -Currently, a 64bit PV guest can appear to set and clear FSGSBASE in %cr4, but -the bit remains set in hardware. Therefore, the {RD,WR}{FS,GS}BASE are usable -even when the guest kernel believes that they are disabled. - -The FSGSBASE feature isn't currently supported in Linux, and its context -switch path has some optimisations which rely on userspace being unable to use -the WR{FS,GS}BASE instructions. Xen's current behaviour undermines this -expectation. - -In 64bit PV guest context, always load the guest kernels setting of FSGSBASE -into %cr4. This requires adjusting how Xen uses the {RD,WR}{FS,GS}BASE -instructions. - - * Delete the cpu_has_fsgsbase helper. It is no longer safe, as users need to - check %cr4 directly. - * The raw __rd{fs,gs}base() helpers are only safe to use when %cr4.fsgsbase - is set. Comment this property. - * The {rd,wr}{fs,gs}{base,shadow}() and read_msr() helpers are updated to use - the current %cr4 value to determine which mechanism to use. - * toggle_guest_mode() and save_segments() are update to avoid reading - fs/gsbase if the values in hardware cannot be stale WRT struct vcpu. A - consequence of this is that the write_cr() path needs to cache the current - bases, as subsequent context switches will skip saving the values. - * write_cr4() is updated to ensure that the shadow %cr4.fsgsbase value is - observed in a safe way WRT the hardware setting, if an interrupt happens to - hit in the middle. - * pv_make_cr4() is updated for 64bit PV guests to use the guest kernels - choice of FSGSBASE. - -This is part of XSA-293 - -Reported-by: Andy Lutomirski -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c -index 675152a..29f892c 100644 ---- a/xen/arch/x86/domain.c -+++ b/xen/arch/x86/domain.c -@@ -1433,7 +1433,8 @@ static void save_segments(struct vcpu *v) - regs->fs = read_sreg(fs); - regs->gs = read_sreg(gs); - -- if ( cpu_has_fsgsbase && !is_pv_32bit_vcpu(v) ) -+ /* %fs/%gs bases can only be stale if WR{FS,GS}BASE are usable. */ -+ if ( (read_cr4() & X86_CR4_FSGSBASE) && !is_pv_32bit_vcpu(v) ) - { - v->arch.pv_vcpu.fs_base = __rdfsbase(); - if ( v->arch.flags & TF_kernel_mode ) -diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c -index 3965959..228a174 100644 ---- a/xen/arch/x86/pv/domain.c -+++ b/xen/arch/x86/pv/domain.c -@@ -140,6 +140,16 @@ unsigned long pv_make_cr4(const struct vcpu *v) - if ( d->arch.vtsc || (v->arch.pv_vcpu.ctrlreg[4] & X86_CR4_TSD) ) - cr4 |= X86_CR4_TSD; - -+ /* -+ * The {RD,WR}{FS,GS}BASE are only useable in 64bit code segments. While -+ * we must not have CR4.FSGSBASE set behind the back of a 64bit PV kernel, -+ * we do leave it set in 32bit PV context to speed up Xen's context switch -+ * path. -+ */ -+ if ( !is_pv_32bit_domain(d) && -+ !(v->arch.pv_vcpu.ctrlreg[4] & X86_CR4_FSGSBASE) ) -+ cr4 &= ~X86_CR4_FSGSBASE; -+ - return cr4; - } - -@@ -375,7 +385,8 @@ void toggle_guest_mode(struct vcpu *v) - { - ASSERT(!is_pv_32bit_vcpu(v)); - -- if ( cpu_has_fsgsbase ) -+ /* %fs/%gs bases can only be stale if WR{FS,GS}BASE are usable. */ -+ if ( read_cr4() & X86_CR4_FSGSBASE ) - { - if ( v->arch.flags & TF_kernel_mode ) - v->arch.pv_vcpu.gs_base_kernel = __rdgsbase(); -diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c -index 4abbc14..312c1ee 100644 ---- a/xen/arch/x86/pv/emul-priv-op.c -+++ b/xen/arch/x86/pv/emul-priv-op.c -@@ -786,6 +786,17 @@ static int write_cr(unsigned int reg, unsigned long val, - } - - case 4: /* Write CR4 */ -+ /* -+ * If this write will disable FSGSBASE, refresh Xen's idea of the -+ * guest bases now that they can no longer change. -+ */ -+ if ( (curr->arch.pv_vcpu.ctrlreg[4] & X86_CR4_FSGSBASE) && -+ !(val & X86_CR4_FSGSBASE) ) -+ { -+ curr->arch.pv_vcpu.fs_base = __rdfsbase(); -+ curr->arch.pv_vcpu.gs_base_kernel = __rdgsbase(); -+ } -+ - curr->arch.pv_vcpu.ctrlreg[4] = pv_fixup_guest_cr4(curr, val); - write_cr4(pv_make_cr4(curr)); - ctxt_switch_levelling(curr); -@@ -835,14 +846,15 @@ static int read_msr(unsigned int reg, uint64_t *val, - case MSR_FS_BASE: - if ( is_pv_32bit_domain(currd) ) - break; -- *val = cpu_has_fsgsbase ? __rdfsbase() : curr->arch.pv_vcpu.fs_base; -+ *val = (read_cr4() & X86_CR4_FSGSBASE) ? __rdfsbase() -+ : curr->arch.pv_vcpu.fs_base; - return X86EMUL_OKAY; - - case MSR_GS_BASE: - if ( is_pv_32bit_domain(currd) ) - break; -- *val = cpu_has_fsgsbase ? __rdgsbase() -- : curr->arch.pv_vcpu.gs_base_kernel; -+ *val = (read_cr4() & X86_CR4_FSGSBASE) ? __rdgsbase() -+ : curr->arch.pv_vcpu.gs_base_kernel; - return X86EMUL_OKAY; - - case MSR_SHADOW_GS_BASE: -diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c -index ecb0149..a353d76 100644 ---- a/xen/arch/x86/setup.c -+++ b/xen/arch/x86/setup.c -@@ -1567,7 +1567,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) - - cr4_pv32_mask = mmu_cr4_features & XEN_CR4_PV32_BITS; - -- if ( cpu_has_fsgsbase ) -+ if ( boot_cpu_has(X86_FEATURE_FSGSBASE) ) - set_in_cr4(X86_CR4_FSGSBASE); - - if ( opt_invpcid && cpu_has_invpcid ) -diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h -index b237da1..861cb0a 100644 ---- a/xen/include/asm-x86/cpufeature.h -+++ b/xen/include/asm-x86/cpufeature.h -@@ -90,7 +90,6 @@ - #define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) - - /* CPUID level 0x00000007:0.ebx */ --#define cpu_has_fsgsbase boot_cpu_has(X86_FEATURE_FSGSBASE) - #define cpu_has_bmi1 boot_cpu_has(X86_FEATURE_BMI1) - #define cpu_has_hle boot_cpu_has(X86_FEATURE_HLE) - #define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2) -diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h -index afbeb7f..1ba6ee3 100644 ---- a/xen/include/asm-x86/msr.h -+++ b/xen/include/asm-x86/msr.h -@@ -120,6 +120,14 @@ static inline uint64_t rdtsc_ordered(void) - : "=a" (low), "=d" (high) \ - : "c" (counter)) - -+/* -+ * On hardware supporting FSGSBASE, the value loaded into hardware is the -+ * guest kernel's choice for 64bit PV guests (Xen's choice for Idle, HVM and -+ * 32bit PV). -+ * -+ * Therefore, the {RD,WR}{FS,GS}BASE instructions are only safe to use if -+ * %cr4.fsgsbase is set. -+ */ - static inline unsigned long __rdfsbase(void) - { - unsigned long base; -@@ -150,7 +158,7 @@ static inline unsigned long rdfsbase(void) - { - unsigned long base; - -- if ( cpu_has_fsgsbase ) -+ if ( read_cr4() & X86_CR4_FSGSBASE ) - return __rdfsbase(); - - rdmsrl(MSR_FS_BASE, base); -@@ -162,7 +170,7 @@ static inline unsigned long rdgsbase(void) - { - unsigned long base; - -- if ( cpu_has_fsgsbase ) -+ if ( read_cr4() & X86_CR4_FSGSBASE ) - return __rdgsbase(); - - rdmsrl(MSR_GS_BASE, base); -@@ -174,7 +182,7 @@ static inline unsigned long rdgsshadow(void) - { - unsigned long base; - -- if ( cpu_has_fsgsbase ) -+ if ( read_cr4() & X86_CR4_FSGSBASE ) - { - asm volatile ( "swapgs" ); - base = __rdgsbase(); -@@ -188,7 +196,7 @@ static inline unsigned long rdgsshadow(void) - - static inline void wrfsbase(unsigned long base) - { -- if ( cpu_has_fsgsbase ) -+ if ( read_cr4() & X86_CR4_FSGSBASE ) - #ifdef HAVE_AS_FSGSBASE - asm volatile ( "wrfsbase %0" :: "r" (base) ); - #else -@@ -200,7 +208,7 @@ static inline void wrfsbase(unsigned long base) - - static inline void wrgsbase(unsigned long base) - { -- if ( cpu_has_fsgsbase ) -+ if ( read_cr4() & X86_CR4_FSGSBASE ) - #ifdef HAVE_AS_FSGSBASE - asm volatile ( "wrgsbase %0" :: "r" (base) ); - #else -@@ -212,7 +220,7 @@ static inline void wrgsbase(unsigned long base) - - static inline void wrgsshadow(unsigned long base) - { -- if ( cpu_has_fsgsbase ) -+ if ( read_cr4() & X86_CR4_FSGSBASE ) - { - asm volatile ( "swapgs\n\t" - #ifdef HAVE_AS_FSGSBASE -diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h -index 2bd9e69..8e253dc 100644 ---- a/xen/include/asm-x86/processor.h -+++ b/xen/include/asm-x86/processor.h -@@ -305,11 +305,31 @@ static inline unsigned long read_cr4(void) - - static inline void write_cr4(unsigned long val) - { -+ struct cpu_info *info = get_cpu_info(); -+ - /* No global pages in case of PCIDs enabled! */ - ASSERT(!(val & X86_CR4_PGE) || !(val & X86_CR4_PCIDE)); - -- get_cpu_info()->cr4 = val; -- asm volatile ( "mov %0,%%cr4" : : "r" (val) ); -+ /* -+ * On hardware supporting FSGSBASE, the value in %cr4 is the kernel's -+ * choice for 64bit PV guests, which impacts whether Xen can use the -+ * instructions. -+ * -+ * The {rd,wr}{fs,gs}base() helpers use info->cr4 to work out whether it -+ * is safe to execute the {RD,WR}{FS,GS}BASE instruction, falling back to -+ * the MSR path if not. Some users require interrupt safety. -+ * -+ * If FSGSBASE is currently or about to become clear, reflect this in -+ * info->cr4 before updating %cr4, so an interrupt which hits in the -+ * middle won't observe FSGSBASE set in info->cr4 but clear in %cr4. -+ */ -+ info->cr4 = val & (info->cr4 | ~X86_CR4_FSGSBASE); -+ -+ asm volatile ( "mov %[val], %%cr4" -+ : "+m" (info->cr4) /* Force ordering without a barrier. */ -+ : [val] "r" (val) ); -+ -+ info->cr4 = val; - } - - /* Clear and set 'TS' bit respectively */ diff --git a/emulators/xen-kernel/files/xsa294-4.11.patch b/emulators/xen-kernel/files/xsa294-4.11.patch deleted file mode 100644 index a0784d928f3..00000000000 --- a/emulators/xen-kernel/files/xsa294-4.11.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Jan Beulich -Subject: x86/pv: _toggle_guest_pt() may not skip TLB flush for shadow mode guests - -For shadow mode guests (e.g. PV ones forced into that mode as L1TF -mitigation, or during migration) update_cr3() -> sh_update_cr3() may -result in a change to the (shadow) root page table (compared to the -previous one when running the same vCPU with the same PCID). This can, -first and foremost, be a result of memory pressure on the shadow memory -pool of the domain. Shadow code legitimately relies on the original -(prior to commit 5c81d260c2 ["xen/x86: use PCID feature"]) behavior of -the subsequent CR3 write to flush the TLB of entries still left from -walks with an earlier, different (shadow) root page table. - -Restore the flushing behavior, also for the second CR3 write on the exit -path to guest context when XPTI is active. For the moment accept that -this will introduce more flushes than are strictly necessary - no flush -would be needed when the (shadow) root page table doesn't actually -change, but this information isn't readily (i.e. without introducing a -layering violation) available here. - -This is XSA-294. - -Reported-by: XXX PERSON -Signed-off-by: Jan Beulich -Tested-by: Juergen Gross -Reviewed-by: Andrew Cooper - -diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c -index b75ff6b..528413a 100644 ---- a/xen/arch/x86/pv/domain.c -+++ b/xen/arch/x86/pv/domain.c -@@ -296,21 +296,35 @@ int pv_domain_initialise(struct domain *d) - static void _toggle_guest_pt(struct vcpu *v) - { - const struct domain *d = v->domain; -+ struct cpu_info *cpu_info = get_cpu_info(); -+ unsigned long cr3; - - v->arch.flags ^= TF_kernel_mode; - update_cr3(v); - if ( d->arch.pv_domain.xpti ) - { -- struct cpu_info *cpu_info = get_cpu_info(); -- - cpu_info->root_pgt_changed = true; - cpu_info->pv_cr3 = __pa(this_cpu(root_pgt)) | - (d->arch.pv_domain.pcid - ? get_pcid_bits(v, true) : 0); - } - -- /* Don't flush user global mappings from the TLB. Don't tick TLB clock. */ -- write_cr3(v->arch.cr3); -+ /* -+ * Don't flush user global mappings from the TLB. Don't tick TLB clock. -+ * -+ * In shadow mode, though, update_cr3() may need to be accompanied by a -+ * TLB flush (for just the incoming PCID), as the top level page table may -+ * have changed behind our backs. To be on the safe side, suppress the -+ * no-flush unconditionally in this case. The XPTI CR3 write, if enabled, -+ * will then need to be a flushing one too. -+ */ -+ cr3 = v->arch.cr3; -+ if ( shadow_mode_enabled(d) ) -+ { -+ cr3 &= ~X86_CR3_NOFLUSH; -+ cpu_info->pv_cr3 &= ~X86_CR3_NOFLUSH; -+ } -+ write_cr3(cr3); - - if ( !(v->arch.flags & TF_kernel_mode) ) - return; diff --git a/emulators/xen-kernel/pkg-message b/emulators/xen-kernel/pkg-message index 9ba82df1469..9105ffc7bd4 100644 --- a/emulators/xen-kernel/pkg-message +++ b/emulators/xen-kernel/pkg-message @@ -7,12 +7,8 @@ In /etc/ttys: xc0 "/usr/libexec/getty Pc" xterm on secure In /boot/loader.conf for a dom0 with 2G memory and 4 vcpus: - hw.pci.mcfg=0 xen_kernel="/boot/xen" xen_cmdline="dom0_mem=2048M dom0_max_vcpus=4 dom0=pvh com1=115200,8n1 guest_loglvl=all loglvl=all" Add to the above xen_cmdline in order to activate the serial console: console=com1 - -In /boot/menu.rc.local: - try-include /boot/xen.4th diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 8c7c40580bd..8e9cb04026f 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -3,7 +3,7 @@ PORTNAME= flightgear PORTVERSION= 2018.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} diff --git a/games/flightgear/files/patch-src_Environment_realwx__ctrl.cxx b/games/flightgear/files/patch-src_Environment_realwx__ctrl.cxx new file mode 100644 index 00000000000..34d6f4b6eb5 --- /dev/null +++ b/games/flightgear/files/patch-src_Environment_realwx__ctrl.cxx @@ -0,0 +1,14 @@ +# games/flightgear: METAR data won't download +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237400 + +--- src/Environment/realwx_ctrl.cxx.orig 2019-04-20 07:47:41 UTC ++++ src/Environment/realwx_ctrl.cxx +@@ -426,7 +426,7 @@ void NoaaMetarRealWxController::requestMetar + ) + { + static const std::string NOAA_BASE_URL = +- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/"; ++ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/"; + class NoaaMetarGetRequest: + public simgear::HTTP::MemoryRequest + { diff --git a/games/flightgear/files/patch-src_Main_metar__main.cxx b/games/flightgear/files/patch-src_Main_metar__main.cxx new file mode 100644 index 00000000000..c69f0913d6e --- /dev/null +++ b/games/flightgear/files/patch-src_Main_metar__main.cxx @@ -0,0 +1,14 @@ +# games/flightgear: METAR data won't download +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237400 + +--- src/Main/metar_main.cxx.orig 2019-04-20 07:48:18 UTC ++++ src/Main/metar_main.cxx +@@ -539,7 +539,7 @@ int main(int argc, char *argv[]) + try + { + static const std::string NOAA_BASE_URL = +- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/"; ++ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/"; + HTTP::MemoryRequest* mr = new HTTP::MemoryRequest + ( + NOAA_BASE_URL diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile index 2ed96b7a291..2432e59f6db 100644 --- a/graphics/exact-image/Makefile +++ b/graphics/exact-image/Makefile @@ -12,6 +12,10 @@ COMMENT= Fast image processing library LICENSE= GPLv2 +BROKEN_armv6= fails to configure: C++ compiler is not installed or does not work correctly +BROKEN_armv7= fails to configure: C++ compiler is not installed or does not work correctly +BROKEN_i386= call to 'abs' is ambiguous + BUILD_DEPENDS= swig3.0:devel/swig30 LIB_DEPENDS= libagg.so:graphics/agg \ libtiff.so:graphics/tiff \ @@ -23,9 +27,6 @@ LIB_DEPENDS= libagg.so:graphics/agg \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -BROKEN_armv6= fails to configure: C++ compiler is not installed or does not work correctly -BROKEN_armv7= fails to configure: C++ compiler is not installed or does not work correctly - #hack to get custom exactcode configure script to enable tiff support with #broken headers on c++ in base system: CPPFLAGS+= -fpermissive -I${LOCALBASE}/include diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile index e6be8ccf993..64dc3276cc0 100644 --- a/lang/gcc7-devel/Makefile +++ b/lang/gcc7-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 7.4.1.s20190411 +PORTVERSION= 7.4.1.s20190418 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo index c97c3475983..cbf9dcf0582 100644 --- a/lang/gcc7-devel/distinfo +++ b/lang/gcc7-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555157792 -SHA256 (gcc-7-20190411.tar.xz) = 0b502b85c953c130e53820a685544c30fc040d2e29278dc4591b4586daf99473 -SIZE (gcc-7-20190411.tar.xz) = 59350252 +TIMESTAMP = 1555942393 +SHA256 (gcc-7-20190418.tar.xz) = 082381f532d4d11244de3d772dfc8c7b22f86a7f17c10fbab749c0db0bc16ce6 +SIZE (gcc-7-20190418.tar.xz) = 59350172 diff --git a/lang/gcc9-devel/Makefile b/lang/gcc9-devel/Makefile index ba1234292ef..4d630e14cff 100644 --- a/lang/gcc9-devel/Makefile +++ b/lang/gcc9-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 9.0.1.s20190414 +PORTVERSION= 9.0.1.s20190421 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc9-devel/distinfo b/lang/gcc9-devel/distinfo index c4939bc30ea..d8cbe975e54 100644 --- a/lang/gcc9-devel/distinfo +++ b/lang/gcc9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555369825 -SHA256 (gcc-9-20190414.tar.xz) = ffc18d54977fcf95951b0d1d200d1bdc5ad4f377d58f09a21b0d53bd03f496fb -SIZE (gcc-9-20190414.tar.xz) = 68732408 +TIMESTAMP = 1555942528 +SHA256 (gcc-9-20190421.tar.xz) = 235eb671f1a1c92de49ff9c3e7bb8e9a8b7f7d6a5bddf8aad94cf6015fee72b9 +SIZE (gcc-9-20190421.tar.xz) = 68759352 diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 6234c59a80b..23be109b01a 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.9-133-g2cf7500760 +GH_TAGNAME= v5.29.10-9-g07ba20f405 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 ccfca7f0e2d..b0957e318fc 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555328404 -SHA256 (perl/Perl-perl5-v5.29.9-133-g2cf7500760_GH0.tar.gz) = f137e931b405968c25eda752918420ca7e0a00ecb02f730938f00513bbe6e12f -SIZE (perl/Perl-perl5-v5.29.9-133-g2cf7500760_GH0.tar.gz) = 19306766 +TIMESTAMP = 1556019006 +SHA256 (perl/Perl-perl5-v5.29.10-9-g07ba20f405_GH0.tar.gz) = 5ec1825a205479bdf6a3b3553100d1ba72453e14c753259166c090c517da146d +SIZE (perl/Perl-perl5-v5.29.10-9-g07ba20f405_GH0.tar.gz) = 19318913 diff --git a/lang/perl5-devel/files/patch-Configure b/lang/perl5-devel/files/patch-Configure index 04b64ab7959..fa8516a1239 100644 --- a/lang/perl5-devel/files/patch-Configure +++ b/lang/perl5-devel/files/patch-Configure @@ -1,3 +1,7 @@ +- Allow setting cf_time (reproducible builds) +- ? +- ? + --- Configure.orig 2019-03-11 04:03:26 UTC +++ Configure @@ -3872,7 +3872,10 @@ esac diff --git a/lang/perl5-devel/files/patch-Makefile.SH b/lang/perl5-devel/files/patch-Makefile.SH index 4c83706d96a..c65b5dfc7a3 100644 --- a/lang/perl5-devel/files/patch-Makefile.SH +++ b/lang/perl5-devel/files/patch-Makefile.SH @@ -1,3 +1,5 @@ +Allow customisation of shrpldflags. + --- Makefile.SH.orig 2015-09-08 05:21:36 UTC +++ Makefile.SH @@ -40,7 +40,6 @@ esac diff --git a/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm b/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm index d756b79c879..e1fe92f6791 100644 --- a/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm +++ b/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm @@ -1,3 +1,5 @@ +Make installed files writable by the installing user. + --- cpan/ExtUtils-Install/lib/ExtUtils/Install.pm.orig 2017-06-05 16:14:15 UTC +++ cpan/ExtUtils-Install/lib/ExtUtils/Install.pm @@ -825,7 +825,7 @@ sub install { #XXX OS-SPECIFIC diff --git a/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_t_Install.t b/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_t_Install.t index 409553266dd..1834df9398b 100644 --- a/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_t_Install.t +++ b/lang/perl5-devel/files/patch-cpan_ExtUtils-Install_t_Install.t @@ -1,3 +1,5 @@ +Make installed files writable by the installing user. (fix tests) + --- cpan/ExtUtils-Install/t/Install.t.orig 2015-10-14 14:27:14 UTC +++ cpan/ExtUtils-Install/t/Install.t @@ -240,7 +240,7 @@ SKIP: { diff --git a/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm b/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm index 189762cd139..c08e3459dcd 100644 --- a/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm +++ b/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm @@ -1,3 +1,5 @@ +- Allow overriding PREFIX? + --- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig 2017-06-11 14:35:46 UTC +++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm @@ -2031,13 +2031,14 @@ sub init_INSTALL_from_PREFIX { diff --git a/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t b/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t index a7ae2c382b2..dc3a3ee1a9c 100644 --- a/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t +++ b/lang/perl5-devel/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t @@ -1,3 +1,5 @@ +- Allow overriding PREFIX? (fix test) + --- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig 2016-05-29 22:48:24 UTC +++ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t @@ -10,7 +10,7 @@ BEGIN { diff --git a/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm index 7fe2fa241d9..839207741f2 100644 --- a/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm +++ b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm @@ -1,3 +1,5 @@ +Handle MANWIDTH=tty + --- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm.orig 2017-04-03 07:28:44 UTC +++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm @@ -69,6 +69,8 @@ sub _get_columns_from_manwidth { diff --git a/lang/perl5-devel/files/patch-hints_freebsd.sh b/lang/perl5-devel/files/patch-hints_freebsd.sh index b2e82205421..efcbcfea109 100644 --- a/lang/perl5-devel/files/patch-hints_freebsd.sh +++ b/lang/perl5-devel/files/patch-hints_freebsd.sh @@ -1,3 +1,5 @@ +Remove libs that are not here on FreeBSD. + --- hints/freebsd.sh.orig 2016-12-05 10:28:13 UTC +++ hints/freebsd.sh @@ -88,6 +88,8 @@ case "$osvers" in diff --git a/lang/perl5-devel/files/patch-perl.c b/lang/perl5-devel/files/patch-perl.c index ec922fe1e8c..8ce0960e064 100644 --- a/lang/perl5-devel/files/patch-perl.c +++ b/lang/perl5-devel/files/patch-perl.c @@ -1,3 +1,5 @@ +Remove compile time information (reproducible builds) + --- perl.c.orig 2019-03-31 21:08:28 UTC +++ perl.c @@ -2009,23 +2009,7 @@ S_Internals_V(pTHX_ CV *cv) diff --git a/lang/perl5-devel/files/patch-t_porting_customized.dat b/lang/perl5-devel/files/patch-t_porting_customized.dat index 9265799c9f7..e97aee3d7bb 100644 --- a/lang/perl5-devel/files/patch-t_porting_customized.dat +++ b/lang/perl5-devel/files/patch-t_porting_customized.dat @@ -1,3 +1,5 @@ +Fix tests for modified files. + --- t/porting/customized.dat.orig 2019-03-31 21:08:28 UTC +++ t/porting/customized.dat @@ -2,6 +2,7 @@ diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist index 37881447223..7c40b698963 100644 --- a/lang/perl5-devel/pkg-plist +++ b/lang/perl5-devel/pkg-plist @@ -959,8 +959,10 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5263delta.1.gz %%MAN1%%/perl5280delta.1.gz %%MAN1%%/perl5281delta.1.gz +%%MAN1%%/perl5282delta.1.gz %%MAN1%%/perl5290delta.1.gz %%MAN1%%/perl52910delta.1.gz +%%MAN1%%/perl52911delta.1.gz %%MAN1%%/perl5291delta.1.gz %%MAN1%%/perl5292delta.1.gz %%MAN1%%/perl5293delta.1.gz @@ -1757,8 +1759,10 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5263delta.pod %%PRIV_LIB%%/pod/perl5280delta.pod %%PRIV_LIB%%/pod/perl5281delta.pod +%%PRIV_LIB%%/pod/perl5282delta.pod %%PRIV_LIB%%/pod/perl5290delta.pod %%PRIV_LIB%%/pod/perl52910delta.pod +%%PRIV_LIB%%/pod/perl52911delta.pod %%PRIV_LIB%%/pod/perl5291delta.pod %%PRIV_LIB%%/pod/perl5292delta.pod %%PRIV_LIB%%/pod/perl5293delta.pod diff --git a/lang/racket/Makefile b/lang/racket/Makefile index 920d0de8689..e9367e21c09 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -18,13 +18,13 @@ COMMENT= Interactive, integrated, graphical Scheme programming environment LICENSE= LGPL3 +IGNORE_powerpc64= ./lightning/lightning.h:81:2: GNU lightning does not support the current target +BROKEN_i386= segfaults during build + LIB_DEPENDS= libffi.so:devel/libffi \ libcairo.so:graphics/cairo \ libpng.so:graphics/png -IGNORE_powerpc64= ./lightning/lightning.h:81:2: GNU lightning does not support the current target -BROKEN_i386= segfaults during build - MAKE_JOBS_UNSAFE=yes CONFLICTS= racket-minimal-[0-9]* @@ -40,8 +40,7 @@ USE_LDCONFIG= yes REINPLACE_ARGS= -i "" USE_GNOME= cairo pango -OPTIONS_DEFINE= DOCS FUTURES -OPTIONS_DEFAULT=FUTURES +OPTIONS_DEFINE= DOCS OPTIONS_DEFINE_amd64= JIT FUTURES OPTIONS_DEFINE_i386= JIT FUTURES diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile index 0cd54ab2b81..5bd385e9ef9 100644 --- a/mail/horde-turba/Makefile +++ b/mail/horde-turba/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= turba -PORTVERSION= 4.2.23 +PORTVERSION= 4.2.24 CATEGORIES= mail www pear PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo index 903035a4557..7d74d286b80 100644 --- a/mail/horde-turba/distinfo +++ b/mail/horde-turba/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535390154 -SHA256 (Horde/turba-4.2.23.tgz) = 19419a50d51d5a35c33f7a92337daaa5abb9796477a7cf000597c28e9ef0a61d -SIZE (Horde/turba-4.2.23.tgz) = 2002609 +TIMESTAMP = 1556105203 +SHA256 (Horde/turba-4.2.24.tgz) = 42fc9649aba7e827f00f02c880edda2d2cbce4269572d1620db19aaaa10bbe6f +SIZE (Horde/turba-4.2.24.tgz) = 2002600 diff --git a/math/cln/Makefile b/math/cln/Makefile index ac72051600c..d328552a133 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -26,8 +26,7 @@ INFO= cln .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 CPPFLAGS+= -DNO_ASM -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_base_cl__low.h \ - ${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \ +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \ ${PATCHDIR}/extra-patch-src_base_low_cl__low__mul.cc .endif diff --git a/math/cln/files/extra-patch-src_base_cl__low.h b/math/cln/files/extra-patch-src_base_cl__low.h deleted file mode 100644 index 7177af422b3..00000000000 --- a/math/cln/files/extra-patch-src_base_cl__low.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/base/cl_low.h.orig 2015-01-28 09:25:18 UTC -+++ src/base/cl_low.h -@@ -207,7 +207,7 @@ inline uint32 mulu32_unchecked (uint32 a - // declared inside a namespace! - } extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil - #else -- extern "C" uint32 mulu32_high; // -> High-Teil -+} extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil - #endif - #if defined(__GNUC__) && defined(__m68k__) && !defined(NO_ASM) - #define mulu32(x,y,hi_zuweisung,lo_zuweisung) \ -@@ -439,7 +439,7 @@ inline uint32 mulu32_unchecked (uint32 a - // Workaround MSVC compiler bug. - } extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r - #else -- extern "C" uint16 divu_16_rest; // -> Rest r -+} extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r - #endif - #endif - #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM) -@@ -589,7 +589,7 @@ inline uint32 mulu32_unchecked (uint32 a - // Workaround MSVC compiler bug. - } extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r - #else -- extern "C" uint32 divu_32_rest; // -> Rest r -+} extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r - #endif - #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM) - #define divu_3232_3232(x,y,q_zuweisung,r_zuweisung) \ diff --git a/math/cln/files/extra-patch-src_base_low_cl__low__div.cc b/math/cln/files/extra-patch-src_base_low_cl__low__div.cc index fa6c2c78daf..15124551e32 100644 --- a/math/cln/files/extra-patch-src_base_low_cl__low__div.cc +++ b/math/cln/files/extra-patch-src_base_low_cl__low__div.cc @@ -1,11 +1,11 @@ ---- src/base/low/cl_low_div.cc.orig 2018-06-23 21:13:46 UTC +--- src/base/low/cl_low_div.cc.orig 2011-04-08 21:07:28 UTC +++ src/base/low/cl_low_div.cc @@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 #endif #ifdef NEED_VAR_divu_64_rest -uint64 divu_64_rest; -+extern "C" uint64 divu_64_rest; ++extern "C" uint64 divu_64_rest = 0; #endif #ifdef NEED_FUNCTION_divu_6464_6464_ diff --git a/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc b/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc index ecdb7c70891..8e8c48c4de2 100644 --- a/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc +++ b/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc @@ -1,4 +1,4 @@ ---- src/base/low/cl_low_mul.cc.orig 2018-06-23 21:15:19 UTC +--- src/base/low/cl_low_mul.cc.orig 2011-04-08 21:06:30 UTC +++ src/base/low/cl_low_mul.cc @@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2) @@ -10,7 +10,7 @@ #ifdef NEED_FUNCTION_mulu64_ -uint64 mulu64_high; -+extern "C" uint64 mulu64_high; ++extern "C" uint64 mulu64_high = 0; namespace cln { extern "C" uint64 mulu64_ (uint64 x, uint64 y); uint64 mulu64_ (uint64 x, uint64 y) diff --git a/math/p5-Math-SigFigs/Makefile b/math/p5-Math-SigFigs/Makefile index d1bdb278d5f..53c94efeb33 100644 --- a/math/p5-Math-SigFigs/Makefile +++ b/math/p5-Math-SigFigs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Math-SigFigs -PORTVERSION= 1.20 +PORTVERSION= 1.21 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/math/p5-Math-SigFigs/distinfo b/math/p5-Math-SigFigs/distinfo index c714fb10694..eec5ad0379c 100644 --- a/math/p5-Math-SigFigs/distinfo +++ b/math/p5-Math-SigFigs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491920876 -SHA256 (Math-SigFigs-1.20.tar.gz) = 194e354d1b6934961f06e984fbaa73c843319c6a3d0bbdfc684080f4745384f0 -SIZE (Math-SigFigs-1.20.tar.gz) = 12469 +TIMESTAMP = 1556127836 +SHA256 (Math-SigFigs-1.21.tar.gz) = 1c8302a9c5b231c8daf47b447664344ddb674ecd2a41402953290cd6d8716b6e +SIZE (Math-SigFigs-1.21.tar.gz) = 13449 diff --git a/math/py-quadprog/pkg-descr b/math/py-quadprog/pkg-descr index 84121961e2f..62f30b42f5f 100644 --- a/math/py-quadprog/pkg-descr +++ b/math/py-quadprog/pkg-descr @@ -3,4 +3,4 @@ Solve a strictly convex quadratic program: Minimize 1/2 x^T G x - a^T x Subject to C.T x >= b -WWW: https://pypi.org/project/quadprog +WWW: https://pypi.org/project/quadprog/ diff --git a/misc/openr2/Makefile b/misc/openr2/Makefile index dc35dec3647..b6558ec9cf9 100644 --- a/misc/openr2/Makefile +++ b/misc/openr2/Makefile @@ -3,13 +3,14 @@ PORTNAME= openr2 PORTVERSION= 1.3.3 -PORTREVISION= 0 CATEGORIES= misc -MASTER_SITES= GOOGLE_CODE MAINTAINER= fjoe@FreeBSD.org COMMENT= MFC/R2 call setup library +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LESSER + BUILD_DEPENDS= ${LOCALBASE}/include/dahdi/user.h:misc/dahdi USE_HARDENING= pie:off relro:off @@ -18,10 +19,9 @@ USE_GITHUB= yes GH_ACCOUNT= moises-silva GH_TAGNAME= d6a5716 +USES= libtool localbase GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include INSTALL_TARGET= install-strip -USES= libtool USE_LDCONFIG= yes post-install: diff --git a/misc/openr2/pkg-descr b/misc/openr2/pkg-descr index d9b7dc135db..bab4e8f918e 100644 --- a/misc/openr2/pkg-descr +++ b/misc/openr2/pkg-descr @@ -7,4 +7,4 @@ them when needed, that's why this library does not depend directly on spandsp, libteletone or zaptel for tone generation and detection (depends on zaptel for CAS bits and general media transmission though) -WWW: http://libopenr2.org/ +WWW: https://libopenr2.org/ diff --git a/multimedia/cmrtlib/Makefile b/multimedia/cmrtlib/Makefile index 70ca4a19e37..fdea10f7a80 100644 --- a/multimedia/cmrtlib/Makefile +++ b/multimedia/cmrtlib/Makefile @@ -2,8 +2,7 @@ PORTNAME= cmrtlib DISTVERSIONPREFIX= intel-media- -DISTVERSION= 19.1.pre3-6 -DISTVERSIONSUFFIX= -g42f6f231 +DISTVERSION= 19.1.0 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/cmrtlib/distinfo b/multimedia/cmrtlib/distinfo index 1441e24ee17..d96ce8f055f 100644 --- a/multimedia/cmrtlib/distinfo +++ b/multimedia/cmrtlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554925126 -SHA256 (intel-media-driver-intel-media-19.1.pre3-6-g42f6f231_GH0.tar.gz) = 4a411888eeb3da383ed9c4b85b0594fa6613a2cf2f3dc9c0be17ca747ba60403 -SIZE (intel-media-driver-intel-media-19.1.pre3-6-g42f6f231_GH0.tar.gz) = 14739773 +TIMESTAMP = 1556113404 +SHA256 (intel-media-driver-intel-media-19.1.0_GH0.tar.gz) = 3c0de20fb1b9035f0096569ddb7682d152e5c358349eec11b0779bb82067a57e +SIZE (intel-media-driver-intel-media-19.1.0_GH0.tar.gz) = 14732817 diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index 85133e5489c..5219abde112 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libmediainfo -PORTVERSION= 18.12 +PORTVERSION= 19.04 CATEGORIES= multimedia MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo index 8fad2826d6b..09c138f1245 100644 --- a/multimedia/libmediainfo/distinfo +++ b/multimedia/libmediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546194191 -SHA256 (MediaInfo_CLI_18.12_GNU_FromSource.tar.xz) = bbc767125f8a539bdcdbf58b8d11ed4880a4873f5d81e1619649f7b3834b1739 -SIZE (MediaInfo_CLI_18.12_GNU_FromSource.tar.xz) = 2876412 +TIMESTAMP = 1556118488 +SHA256 (MediaInfo_CLI_19.04_GNU_FromSource.tar.xz) = 20457dc59ed46e5c628cc90e1b9ef5e7420bf45e22544515de9f2179ab1ac906 +SIZE (MediaInfo_CLI_19.04_GNU_FromSource.tar.xz) = 3039628 diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile index 09203604c3e..924bdd174cc 100644 --- a/multimedia/libva-intel-media-driver/Makefile +++ b/multimedia/libva-intel-media-driver/Makefile @@ -2,8 +2,7 @@ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- -DISTVERSION= 19.1.pre3-6 -DISTVERSIONSUFFIX= -g42f6f231 +DISTVERSION= 19.1.0 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo index 845f967e6d5..68599f1d6dd 100644 --- a/multimedia/libva-intel-media-driver/distinfo +++ b/multimedia/libva-intel-media-driver/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1554925126 -SHA256 (intel-media-driver-intel-media-19.1.pre3-6-g42f6f231_GH0.tar.gz) = 4a411888eeb3da383ed9c4b85b0594fa6613a2cf2f3dc9c0be17ca747ba60403 -SIZE (intel-media-driver-intel-media-19.1.pre3-6-g42f6f231_GH0.tar.gz) = 14739773 +TIMESTAMP = 1556113404 +SHA256 (intel-media-driver-intel-media-19.1.0_GH0.tar.gz) = 3c0de20fb1b9035f0096569ddb7682d152e5c358349eec11b0779bb82067a57e +SIZE (intel-media-driver-intel-media-19.1.0_GH0.tar.gz) = 14732817 SHA256 (95549679029d.patch) = 348ec62564031f994669da4f70c735061bbedbe7057db68185798826989cf75b SIZE (95549679029d.patch) = 1005 diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile index 6b422784131..de86fe04be7 100644 --- a/multimedia/libzen/Makefile +++ b/multimedia/libzen/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libzen -PORTVERSION= 18.12 +PORTVERSION= 19.04 CATEGORIES= multimedia MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/multimedia/libzen/distinfo b/multimedia/libzen/distinfo index 8fad2826d6b..acd7f34e83a 100644 --- a/multimedia/libzen/distinfo +++ b/multimedia/libzen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546194191 -SHA256 (MediaInfo_CLI_18.12_GNU_FromSource.tar.xz) = bbc767125f8a539bdcdbf58b8d11ed4880a4873f5d81e1619649f7b3834b1739 -SIZE (MediaInfo_CLI_18.12_GNU_FromSource.tar.xz) = 2876412 +TIMESTAMP = 1556118491 +SHA256 (MediaInfo_CLI_19.04_GNU_FromSource.tar.xz) = 20457dc59ed46e5c628cc90e1b9ef5e7420bf45e22544515de9f2179ab1ac906 +SIZE (MediaInfo_CLI_19.04_GNU_FromSource.tar.xz) = 3039628 diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile index 3157344ffcd..7430f5a0cad 100644 --- a/multimedia/mediainfo/Makefile +++ b/multimedia/mediainfo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mediainfo -PORTVERSION= 18.12 +PORTVERSION= 19.04 CATEGORIES= multimedia MASTER_SITES= https://mediaarea.net/download/binary/${PORTNAME}/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo index 8fad2826d6b..5c865c2dc65 100644 --- a/multimedia/mediainfo/distinfo +++ b/multimedia/mediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546194191 -SHA256 (MediaInfo_CLI_18.12_GNU_FromSource.tar.xz) = bbc767125f8a539bdcdbf58b8d11ed4880a4873f5d81e1619649f7b3834b1739 -SIZE (MediaInfo_CLI_18.12_GNU_FromSource.tar.xz) = 2876412 +TIMESTAMP = 1556118494 +SHA256 (MediaInfo_CLI_19.04_GNU_FromSource.tar.xz) = 20457dc59ed46e5c628cc90e1b9ef5e7420bf45e22544515de9f2179ab1ac906 +SIZE (MediaInfo_CLI_19.04_GNU_FromSource.tar.xz) = 3039628 diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index ee86cdc3d6c..dfda6b6384f 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -2,7 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.5.11 +DISTVERSION= 1.6.7 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com @@ -33,8 +33,8 @@ GH_PROJECT= tdesktop GH_TUPLE= catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \ mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \ Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \ - telegramdesktop:libtgvoip:59a975b:libtgvoip/Telegram/ThirdParty/libtgvoip \ - telegramdesktop:crl:9b7c6b5:crl/Telegram/ThirdParty/crl \ + telegramdesktop:libtgvoip:e701050:libtgvoip/Telegram/ThirdParty/libtgvoip \ + telegramdesktop:crl:84072fb:crl/Telegram/ThirdParty/crl \ Cyan4973:xxHash:7cc9639:xxhash/Telegram/ThirdParty/xxHash USE_GNOME= glib20 USE_QT= core gui imageformats network widgets buildtools_build qmake_build dbus diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index 88de7314986..2fd9a4f7789 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1549225629 -SHA256 (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = e7dde48fc0bb9d5e5a94d5f4300b68033700bb8bf7926d710334e0ba9b7d6af8 -SIZE (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = 14244290 +TIMESTAMP = 1555805465 +SHA256 (telegramdesktop-tdesktop-v1.6.7_GH0.tar.gz) = 77f4cf6507d1ebc26eaef472aa4817cc57a77c5e3065f6b2afa294530f0633a1 +SIZE (telegramdesktop-tdesktop-v1.6.7_GH0.tar.gz) = 14323106 SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2 SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264 SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354 SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686 SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468 SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930 -SHA256 (telegramdesktop-libtgvoip-59a975b_GH0.tar.gz) = c75846b685370982ab657d3dc5caee59dfaf4038bcd5a24b8004ce84f6c9fcfb -SIZE (telegramdesktop-libtgvoip-59a975b_GH0.tar.gz) = 1450257 -SHA256 (telegramdesktop-crl-9b7c6b5_GH0.tar.gz) = 4ce7f672aa9a944631152be747099e966fd2b71ec9b0ddd76d129b9ec934a72b -SIZE (telegramdesktop-crl-9b7c6b5_GH0.tar.gz) = 21540 +SHA256 (telegramdesktop-libtgvoip-e701050_GH0.tar.gz) = 16cb5f4588f4a35877aacc5f39bb93e9c0ac5fca1ddfc4dabda841131c29d3d5 +SIZE (telegramdesktop-libtgvoip-e701050_GH0.tar.gz) = 1484741 +SHA256 (telegramdesktop-crl-84072fb_GH0.tar.gz) = 0d1c5a08b94c90ef213fadfdfb1f4587a23c01474195931c67bc98fb7fd01936 +SIZE (telegramdesktop-crl-84072fb_GH0.tar.gz) = 21681 SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534 diff --git a/net-im/telegram-desktop/files/gyp-patches b/net-im/telegram-desktop/files/gyp-patches index 6ba48616c38..92ffa612826 100644 --- a/net-im/telegram-desktop/files/gyp-patches +++ b/net-im/telegram-desktop/files/gyp-patches @@ -1,4 +1,4 @@ ---- Telegram/gyp/codegen_rules.gypi.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/codegen_rules.gypi.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/codegen_rules.gypi @@ -15,7 +15,7 @@ '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', @@ -25,7 +25,7 @@ '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', '<@(qrc_files)', ], ---- Telegram/gyp/lib_export.gyp.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/lib_export.gyp.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/lib_export.gyp @@ -46,7 +46,7 @@ 'include_dirs': [ @@ -36,7 +36,7 @@ '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', '<(submodules_loc)/crl/src', ---- Telegram/gyp/lib_scheme.gyp.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/lib_scheme.gyp.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/lib_scheme.gyp @@ -48,7 +48,7 @@ '<(SHARED_INTERMEDIATE_DIR)/scheme.h', @@ -47,7 +47,7 @@ '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl', ], 'message': 'codegen_scheme-ing scheme.tl..', ---- Telegram/gyp/qt_moc.gypi.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/qt_moc.gypi.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/qt_moc.gypi @@ -12,12 +12,12 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', @@ -64,7 +64,7 @@ # '\\|]")), qsl("_")); #elif defined Q_OS_MAC name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp index bf7f8e0284a..7dbae43c285 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -369,9 +369,9 @@ QString CleanDocumentName(QString name) { +@@ -353,9 +353,9 @@ QString CleanDocumentName(QString name) { '|', #elif defined Q_OS_MAC // Q_OS_WIN ':', diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp index 968c5934b13..18ae44cef01 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp @@ -1,13 +1,13 @@ ---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp -@@ -1389,13 +1389,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre +@@ -1392,13 +1392,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // TODO -#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 +#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD if (_selectedItem && _selectedText.from != _selectedText.to) { - SetClipboardWithEntities( + SetClipboardText( _selectedItem->selectedText(_selectedText), QClipboard::Selection); } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp index 8a13bc70964..a4a39d4f712 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1362,7 +1362,7 @@ void HistoryInner::mouseActionFinish( +@@ -1376,7 +1376,7 @@ void HistoryInner::mouseActionFinish( _widget->noSelectingScroll(); _widget->updateTopBarSelection(); @@ -9,7 +9,7 @@ if (!_selected.empty() && _selected.cbegin()->second != FullSelection) { const auto [item, selection] = *_selected.cbegin(); if (const auto view = item->mainView()) { -@@ -1371,7 +1371,7 @@ void HistoryInner::mouseActionFinish( +@@ -1385,7 +1385,7 @@ void HistoryInner::mouseActionFinish( QClipboard::Selection); } } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp index daae4c19ca0..f0b7f2ae404 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -2018,7 +2018,7 @@ void ListWidget::mouseActionFinish( +@@ -2031,7 +2031,7 @@ void ListWidget::mouseActionFinish( _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // #TODO select scroll @@ -9,7 +9,7 @@ if (_selectedTextItem && _selectedTextRange.from != _selectedTextRange.to) { if (const auto view = viewForItem(_selectedTextItem)) { -@@ -2027,7 +2027,7 @@ void ListWidget::mouseActionFinish( +@@ -2040,7 +2040,7 @@ void ListWidget::mouseActionFinish( QClipboard::Selection); } } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp index 5a71501d6b3..11bea57a167 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false; bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; @@ -10,7 +10,7 @@ GtkStatusIcon *_trayIcon = 0; GtkWidget *_trayMenu = 0; GdkPixbuf *_trayPixbuf = 0; -@@ -293,7 +295,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -290,7 +292,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { if (noQtTrayIcon) { #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { @@ -20,7 +20,7 @@ } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, false); } -@@ -309,7 +313,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -306,7 +310,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { if (noQtTrayIcon) { #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { @@ -30,7 +30,7 @@ } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, true); } -@@ -328,7 +334,9 @@ void MainWindow::psUpdateIndicator() { +@@ -325,7 +331,9 @@ void MainWindow::psUpdateIndicator() { if (iconFile.exists()) { QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName()); name = name.mid(0, name.size() - 4); @@ -40,7 +40,7 @@ } else { useAppIndicator = false; } -@@ -425,11 +433,15 @@ void MainWindow::LibsLoaded() { +@@ -422,11 +430,15 @@ void MainWindow::LibsLoaded() { && (Libs::g_object_ref_sink != nullptr) && (Libs::g_object_unref != nullptr); @@ -56,7 +56,7 @@ if (tryAppIndicator && useGtkBase && useAppIndicator) { noQtTrayIcon = true; -@@ -465,6 +477,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -462,6 +474,7 @@ void MainWindow::psCreateTrayIcon() { } #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION @@ -64,7 +64,7 @@ if (useAppIndicator) { DEBUG_LOG(("Trying to create AppIndicator")); _trayMenu = Libs::gtk_menu_new(); -@@ -495,6 +508,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -492,6 +505,7 @@ void MainWindow::psCreateTrayIcon() { useAppIndicator = false; } } @@ -72,7 +72,7 @@ if (useStatusIcon) { if (Libs::gdk_init_check(0, 0)) { if (!_trayMenu) _trayMenu = Libs::gtk_menu_new(); -@@ -619,10 +633,12 @@ MainWindow::~MainWindow() { +@@ -616,10 +630,12 @@ MainWindow::~MainWindow() { Libs::g_object_unref(_trayMenu); _trayMenu = nullptr; } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h index ac03ab1d1fb..9663ca7a165 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/platform/platform_specific.h -@@ -53,8 +53,8 @@ void finish(); +@@ -58,8 +58,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp index a30f531c8d0..31a9b533fd9 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -478,11 +478,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( +@@ -479,11 +479,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( _deleted = true; // Ubuntu has a lag if deleteLater() called immediately. diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp index 6ee3cef3bc1..3bb084273bd 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -1760,11 +1760,11 @@ class TextPainter { (private) +@@ -1762,11 +1762,11 @@ class TextPainter { (private) if (item == -1) return; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp index e4caec2459f..7f1bcc48c64 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/ui/twidget.cpp @@ -249,9 +249,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T , button @@ -10,5 +10,5 @@ -#endif // OS_MAC_OLD +#endif ); - ev.setTimestamp(getms()); + ev.setTimestamp(crl::now()); QGuiApplication::sendEvent(windowHandle, &ev); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp index 9a21cadeae7..b914b310771 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp @@ -1,13 +1,13 @@ ---- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/ui/widgets/labels.cpp -@@ -364,11 +364,11 @@ Text::StateResult FlatLabel::dragActionFinish(const QP +@@ -361,11 +361,11 @@ Text::StateResult FlatLabel::dragActionFinish(const QP } } -#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 +#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD if (!_selection.empty()) { - QApplication::clipboard()->setText(_text.originalText(_selection, _contextExpandLinksMode), QClipboard::Selection); + SetClipboardText(_text.toTextForMimeData(_selection), QClipboard::Selection); } -#endif // Q_OS_LINUX32 || Q_OS_LINUX64 +#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp index 76764a6492a..06b516a7484 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/window/main_window.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/window/main_window.cpp -@@ -503,7 +503,7 @@ bool MainWindow::minimizeToTray() { +@@ -521,7 +521,7 @@ bool MainWindow::minimizeToTray() { } void MainWindow::reActivateWindow() { @@ -9,7 +9,7 @@ const auto reActivate = [=] { if (const auto w = App::wnd()) { if (auto f = QApplication::focusWidget()) { -@@ -518,7 +518,7 @@ void MainWindow::reActivateWindow() { +@@ -536,7 +536,7 @@ void MainWindow::reActivateWindow() { }; crl::on_main(this, reActivate); App::CallDelayed(200, this, reActivate); diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp index e9416c7a2bc..4d3c4e9ba27 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-12-31 01:05:58 UTC +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2019-04-03 18:20:00 UTC +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -2840,7 +2840,7 @@ static void initMachTimestart() { +@@ -3048,7 +3048,7 @@ static void initMachTimestart() { #endif double VoIPController::GetCurrentTime(){ diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp index 9f6ba6bdd8e..d690ef4e635 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2018-12-31 01:05:58 UTC +--- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2019-04-03 18:20:00 UTC +++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp -@@ -61,6 +61,7 @@ void NetworkSocketPosix::SetMaxPriority(){ +@@ -64,6 +64,7 @@ void NetworkSocketPosix::SetMaxPriority(){ if(res<0){ LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno)); } diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi b/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi index b7a4d7ae488..f58d183822d 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi +++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi @@ -1,4 +1,4 @@ ---- Telegram/gyp/settings_linux.gypi.orig 2018-08-04 18:53:40 UTC +--- Telegram/gyp/settings_linux.gypi.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/settings_linux.gypi @@ -11,7 +11,6 @@ 'linux_common_flags': [ @@ -8,7 +8,7 @@ '-W', '-fPIC', '-Wno-unused-variable', -@@ -25,7 +24,7 @@ +@@ -26,7 +25,7 @@ ], }, 'conditions': [ @@ -17,7 +17,7 @@ 'defines': [ 'Q_OS_LINUX64', ], -@@ -60,7 +59,6 @@ +@@ -61,7 +60,6 @@ ], 'defines': [ '_REENTRANT', @@ -25,7 +25,7 @@ 'QT_PLUGIN', ], 'cflags_c': [ -@@ -73,9 +71,6 @@ +@@ -74,9 +72,6 @@ '-Wno-register', ], 'make_global_settings': [ diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt index 671ab8a5685..21680249751 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt +++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -830,14 +830,7 @@ +@@ -857,14 +857,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile index 5970a67cff8..cdd48b8f684 100644 --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -3,7 +3,7 @@ # Observium version can be found by looking at ${WRKSRC}/includes/definitions/version.inc.php PORTNAME= observium -PORTVERSION= 0.17.9.8859 +PORTVERSION= 0.18.9.1 PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ @@ -22,7 +22,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= php:cli python${PY_MYSQL} shebangfix SHEBANG_FILES= \ - mibs/process.pl \ poller-wrapper.py \ poller.php \ scripts/ @@ -63,13 +62,14 @@ WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client .include SUB_FILES+= pkg-message observium.conf.sample -SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PHPBASE}/bin/python +SUB_LIST+= PHP="${PREFIX}/bin/php" PYTHON="${PYTHON_CMD}" -ROOT_FILES= add_device.php adduser.php alerter.php alerts.php \ +ROOT_FILES= add_device.php adduser.php alerter.php \ check-errors.php check-services.php config_to_json.php \ config.php.default delete_device.php discovery.php housekeeping.php \ irc.php poller-wrapper.py poller.php rename_device.php \ - snmptrap.php snmptrap.php syslog.php test_alert.php + snmp.conf.example snmpd.conf.example \ + snmptrap.php snmptrap.php syslog.php test_alert.php test_code.php VERSION ROOT_DIRS= html includes libs logs mibs rrd scripts templates tests update PORTDOCS= INSTALL README VERSION diff --git a/net-mgmt/observium/distinfo b/net-mgmt/observium/distinfo index fcb6863cec0..a07d83f831a 100644 --- a/net-mgmt/observium/distinfo +++ b/net-mgmt/observium/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513523116 -SHA256 (observium-0.17.9.8859/observium-community-latest.tar.gz) = dcf2f72b1a1389d523f44bba31bccf72598bb5014c2850f8f3f70a30f0cc05ac -SIZE (observium-0.17.9.8859/observium-community-latest.tar.gz) = 71030546 +TIMESTAMP = 1556045788 +SHA256 (observium-0.18.9.1/observium-community-latest.tar.gz) = b182abb41483389b2e18e8d336560733680f38d66b1dc2f291cbf113a7e1f4d7 +SIZE (observium-0.18.9.1/observium-community-latest.tar.gz) = 76524711 diff --git a/net-mgmt/observium/files/observium.conf.sample.in b/net-mgmt/observium/files/observium.conf.sample.in index d72c5ea4d21..dbcb702254c 100644 --- a/net-mgmt/observium/files/observium.conf.sample.in +++ b/net-mgmt/observium/files/observium.conf.sample.in @@ -5,9 +5,17 @@ # # Replace the '*:8080' by the actual virtual host(name) # you will be using; and consider enabling SSL. An example -# can be fund at e /usr/local/etc/apache24/extra/httpd-ssl.conf +# can be found at /usr/local/etc/apache24/extra/httpd-ssl.conf # + +LoadModule rewrite_module libexec/apache24/mod_rewrite.so + + + +LoadModule php7_module libexec/apache24/libphp7.so + + Listen *:8080 Documentroot "%%WWWDIR%%/html" diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index d1b21f2654d..088e24b17fc 100644 --- a/net-p2p/deluge-cli/Makefile +++ b/net-p2p/deluge-cli/Makefile @@ -3,7 +3,7 @@ PORTNAME= deluge DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.3.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p python PKGNAMESUFFIX= -cli diff --git a/net-p2p/deluge-cli/files/deluge_web.in b/net-p2p/deluge-cli/files/deluge_web.in index 0b05665bee8..d76c25a3c15 100644 --- a/net-p2p/deluge-cli/files/deluge_web.in +++ b/net-p2p/deluge-cli/files/deluge_web.in @@ -45,7 +45,7 @@ deluge_web_prestart() if [ "$deluge_web_user" = 'asjklasdfjklasdf' ]; then err 1 "You must set deluge_web_user to a real, unprivileged user" fi - deluge_web_home=$(pw user show ${deluge_web_user} | cut -d : -f 9) + if [ -z ${deluge_web_home} ]; then err 1 "deluge_web_user does not have a valid home directory." fi @@ -60,6 +60,7 @@ deluge_web_prestart() if [ ! -d "${deluge_web_home}/.python-eggs" ]; then mkdir ${deluge_web_home}/.python-eggs chown -R $deluge_web_user ${deluge_web_home}/.python-eggs + fi chmod 0755 /var/run/${name} chown -R $deluge_web_user /var/run/${name} @@ -76,6 +77,9 @@ load_rc_config $name : ${deluge_web_enable:="NO"} : ${deluge_web_user:="asjklasdfjklasdf"} + +deluge_web_home=$(pw user show ${deluge_web_user} | cut -d : -f 9) + : ${deluge_web_confdir:="${deluge_web_home}/.config/deluge"} : ${deluge_web_loglevel:="error"} : ${deluge_web_logfile:="/var/tmp/${name}.log"} diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile index c44792a2f0d..e3c774b748e 100644 --- a/net-p2p/monero-cli/Makefile +++ b/net-p2p/monero-cli/Makefile @@ -19,6 +19,7 @@ LICENSE= BSD3CLAUSE BROKEN_aarch64= fails to compile: the clang compiler does not support -march=native BROKEN_armv6= fails to compile: the clang compiler does not support -march=native BROKEN_armv7= fails to compile: the clang compiler does not support -march=native +BROKEN_i386= fails to compile: register %r15d is only available in 64-bit mode BROKEN_powerpc64= fails to compile: the clang compiler does not support -march=native LIB_DEPENDS= \ diff --git a/net-p2p/py-libtorrent-rasterbar/Makefile b/net-p2p/py-libtorrent-rasterbar/Makefile index 1ddd712847d..51c8acdc6bc 100644 --- a/net-p2p/py-libtorrent-rasterbar/Makefile +++ b/net-p2p/py-libtorrent-rasterbar/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/../../COPYING LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ ${PY_BOOST} -USES= iconv localbase python +USES= compiler:c11 iconv localbase python USE_PYTHON= distutils autoplist CFLAGS+= -DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331 diff --git a/net/Makefile b/net/Makefile index db1926392ff..29c63cc71ad 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1424,6 +1424,7 @@ SUBDIR += tcpxd SUBDIR += tcpxtract SUBDIR += tdetect + SUBDIR += termshark SUBDIR += tftpgrab SUBDIR += thcrut SUBDIR += throttled diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile index 1f487aa6d5d..4119e1a8478 100644 --- a/net/concourse-fly/Makefile +++ b/net/concourse-fly/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= concourse -PORTVERSION= 4.2.3 +PORTVERSION= 5.1.0 CATEGORIES= net sysutils MASTER_SITES= LOCAL/dumbbell/concourse/ PKGNAMESUFFIX= -fly @@ -11,8 +11,9 @@ COMMENT= CLI for Concourse LICENSE= APACHE20 -GO_CMD= ${LOCALBASE}/bin/go GO_PKGNAME= github.com/concourse/fly +GO_BUILDFLAGS+= -mod=vendor \ + -ldflags="-X github.com/concourse/fly/version.Version=${PORTVERSION}" USES= go tar:xz @@ -24,32 +25,39 @@ PLIST_FILES= bin/fly # repository, which contains many Git submodules, including fly, and # build from there. So basically: # -# git clone --recursive https://github.com/concourse/concourse.gi -# cd concourse -# export GOPATH=$PWD -# cd src/github.com/concourse/fly +# git clone --recursive https://github.com/concourse/concourse.git +# cd concourse/fly # go build # -# Therefore, the source archive contains the Concourse top-level -# repository and all its submodules. It's created using the -# create-src-archive below: +# Unfortunately, this is difficult to integrate as is with the Ports framework: +# * Some submodules are hosted on services other than GitHub +# * Third-party Go dependencies are not Git submodules +# +# We created the `create-src-archive` to create a self-contained +# source archive because the Concourse does not provide one. This +# source archive contains the Git submodules and the third-party Go +# dependencies, fetched using `go mod vendor`. +# +# It is created using the `create-src-archive` target below: # # make create-src-archive # # Because it doesn't match the project layout USES=go expects, we # override the post-extract and do-build targets to adapt the commands. # +# In particular, we must pass `-mod=vendor` to go-install to be able to +# use the third-party dependencies fetched with `go mod vendor`. + # `fly` version is set by default to "0.0.0-dev" in version/Version.go. # Instead of patching the file, we use a linker flag to set the variable # to the port's version. post-extract: - ${LN} -sf ${WRKSRC}/src ${GO_WRKDIR_SRC} + @: do-build: - (cd ${WRKDIR}; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} \ - 'install' -v -ldflags="-X github.com/concourse/fly/version.Version=${PORTVERSION}" ${GO_TARGET}) + (cd ${WRKSRC}/fly; \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} 'install' ${GO_BUILDFLAGS}) .PHONY: create-src-archive ARCHIVE_DIR= ${DISTDIR}/concourse-${PORTVERSION} @@ -58,6 +66,11 @@ create-src-archive: git clone --recursive -b v${PORTVERSION} \ https://github.com/concourse/concourse.git \ ${ARCHIVE_DIR} + GOPATH=$$(mktemp concourse-gopath.XXXX) && \ + (cd ${ARCHIVE_DIR} && \ + ${GO_CMD} mod vendor) && \ + ${FIND} "$$GOPATH" -exec ${CHMOD} u+w {} \; && \ + ${RM} -rf "$$GOPATH" ${FIND} ${ARCHIVE_DIR} \( -name ".git*" -o -name "testdata" \) -depth -exec ${RM} -rf {} \; ${TAR} -cf - -C ${ARCHIVE_DIR:H} ${ARCHIVE_DIR:T} | ${XZ_CMD} > ${ARCHIVE_DIR}.tar.xz ${RM} -rf ${ARCHIVE_DIR} diff --git a/net/concourse-fly/distinfo b/net/concourse-fly/distinfo index 5709ee265cc..ade87596401 100644 --- a/net/concourse-fly/distinfo +++ b/net/concourse-fly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551695393 -SHA256 (concourse-4.2.3.tar.xz) = 22ae461a4f1f526287611fb45e9f2e93c4437d4b8922195813ff0537082cada0 -SIZE (concourse-4.2.3.tar.xz) = 38355156 +TIMESTAMP = 1556121268 +SHA256 (concourse-5.1.0.tar.xz) = 2d796b621b8d7000a6e84c7c7dd441ee702e0730c09b390cf79319ec217dc885 +SIZE (concourse-5.1.0.tar.xz) = 6738124 diff --git a/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod.go b/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod.go deleted file mode 100644 index 23cb03ccf82..00000000000 --- a/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod.go +++ /dev/null @@ -1,8 +0,0 @@ ---- src/github.com/concourse/go-archive/tarfs/mknod.go.orig 2019-03-04 10:29:20 UTC -+++ src/github.com/concourse/go-archive/tarfs/mknod.go -@@ -1,4 +1,4 @@ --// +build !windows -+// +build !windows,!freebsd - - package tarfs - diff --git a/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod__freebsd.go b/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod__freebsd.go deleted file mode 100644 index cf017c2a4ce..00000000000 --- a/net/concourse-fly/files/patch-src_github.com_concourse_go-archive_tarfs_mknod__freebsd.go +++ /dev/null @@ -1,31 +0,0 @@ ---- src/github.com/concourse/go-archive/tarfs/mknod_freebsd.go.orig 2019-03-13 13:08:01 UTC -+++ src/github.com/concourse/go-archive/tarfs/mknod_freebsd.go -@@ -0,0 +1,28 @@ -+// +build freebsd -+ -+package tarfs -+ -+import ( -+ "archive/tar" -+ "syscall" -+ -+ "golang.org/x/sys/unix" -+) -+ -+func mknodEntry(hdr *tar.Header, path string) error { -+ mode := uint32(hdr.Mode & 07777) -+ switch hdr.Typeflag { -+ case tar.TypeBlock: -+ mode |= unix.S_IFBLK -+ case tar.TypeChar: -+ mode |= unix.S_IFCHR -+ case tar.TypeFifo: -+ mode |= unix.S_IFIFO -+ } -+ -+ return syscall.Mknod(path, mode, uint64(mkdev(hdr.Devmajor, hdr.Devminor))) -+} -+ -+func mkdev(major, minor int64) uint32 { -+ return uint32(((minor & 0xfff00) << 12) | ((major & 0xfff) << 8) | (minor & 0xff)) -+} diff --git a/net/concourse-fly/pkg-descr b/net/concourse-fly/pkg-descr index e7865b6d060..994aec758ba 100644 --- a/net/concourse-fly/pkg-descr +++ b/net/concourse-fly/pkg-descr @@ -4,4 +4,4 @@ containers to uploading new pipeline configuration into a running Concourse. Learning how to use `fly` will make using Concourse faster and more useful. -WWW: http://concourse.ci/ +WWW: https://concourse-ci.org/ diff --git a/net/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile index 1982ec11888..0ba352d7e86 100644 --- a/net/google-cloud-sdk/Makefile +++ b/net/google-cloud-sdk/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= google-cloud-sdk -PORTVERSION= 237.0.0 +PORTVERSION= 242.0.0 CATEGORIES= net MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/ DISTNAME= google-cloud-sdk-${PORTVERSION}-linux-x86_64 diff --git a/net/google-cloud-sdk/distinfo b/net/google-cloud-sdk/distinfo index bb12c2bc174..7ed1fbc24e7 100644 --- a/net/google-cloud-sdk/distinfo +++ b/net/google-cloud-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552049702 -SHA256 (google-cloud-sdk-237.0.0-linux-x86_64.tar.gz) = 10e08362e750581c6ff3866314ed439a1bb544755657b204bf719f68e03b4ba3 -SIZE (google-cloud-sdk-237.0.0-linux-x86_64.tar.gz) = 26077405 +TIMESTAMP = 1556054134 +SHA256 (google-cloud-sdk-242.0.0-linux-x86_64.tar.gz) = 96b4359d3131716e44355adb702d066bd2500dad06034cd16796b8c994ee0d24 +SIZE (google-cloud-sdk-242.0.0-linux-x86_64.tar.gz) = 26806749 diff --git a/net/measurement-kit/Makefile b/net/measurement-kit/Makefile index 8c7e23a9273..761ccf76fe4 100644 --- a/net/measurement-kit/Makefile +++ b/net/measurement-kit/Makefile @@ -2,7 +2,7 @@ PORTNAME= measurement-kit DISTVERSIONPREFIX= v -DISTVERSION= 0.9.4 +DISTVERSION= 0.10.1 CATEGORIES= net devel MAINTAINER= egypcio@FreeBSD.org @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --with-libcurl=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} INSTALL_TARGET= install-strip -PORTDOCS= README.md +PORTDOCS= README.md include/README.md OPTIONS_DEFINE= DOCS @@ -35,7 +35,8 @@ do-configure: ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}) post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/include/measurement_kit/README.md ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/include + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/include/measurement_kit/README.md ${STAGEDIR}${DOCSDIR}/include .include diff --git a/net/measurement-kit/distinfo b/net/measurement-kit/distinfo index 4984bca4434..e9eaf5d0404 100644 --- a/net/measurement-kit/distinfo +++ b/net/measurement-kit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552393403 -SHA256 (measurement-kit-measurement-kit-v0.9.4_GH0.tar.gz) = d095c28fa7283c546dcf513b9c60156f5ab7690f33f2de346372cd5328072d36 -SIZE (measurement-kit-measurement-kit-v0.9.4_GH0.tar.gz) = 700157 +TIMESTAMP = 1555576078 +SHA256 (measurement-kit-measurement-kit-v0.10.1_GH0.tar.gz) = 4caf856ebbb28633c7593a9b5b8ee79f0c0436d05ae7391cc59e8d72b260911a +SIZE (measurement-kit-measurement-kit-v0.10.1_GH0.tar.gz) = 745989 diff --git a/net/measurement-kit/pkg-plist b/net/measurement-kit/pkg-plist index beda0e0ce9f..3a35c83ce81 100644 --- a/net/measurement-kit/pkg-plist +++ b/net/measurement-kit/pkg-plist @@ -1,11 +1,7 @@ bin/measurement_kit -include/measurement_kit/README.md include/measurement_kit/common.hpp include/measurement_kit/common/aaa_base.h -include/measurement_kit/common/callback.hpp include/measurement_kit/common/data_usage.hpp -include/measurement_kit/common/error.hpp -include/measurement_kit/common/error_or.hpp include/measurement_kit/common/logger.hpp include/measurement_kit/common/nlohmann/json.hpp include/measurement_kit/common/platform.h @@ -19,18 +15,27 @@ include/measurement_kit/common/portable/sys/socket.h include/measurement_kit/common/portable/sys/time.h include/measurement_kit/common/portable/sys/types.h include/measurement_kit/common/portable/time.h -include/measurement_kit/common/scalar.hpp -include/measurement_kit/common/settings.hpp include/measurement_kit/common/shared_ptr.hpp include/measurement_kit/common/version.h include/measurement_kit/ffi.h -include/measurement_kit/mkapi/orchestra.h +include/measurement_kit/internal/bouncer/bouncer.h +include/measurement_kit/internal/collector/collector.h +include/measurement_kit/internal/geoiplookup/geoiplookup.h +include/measurement_kit/internal/mkapi/orchestra.h +include/measurement_kit/internal/report/report.h +include/measurement_kit/internal/vendor/date.h +include/measurement_kit/internal/vendor/http_parser.h +include/measurement_kit/internal/vendor/json.hpp +include/measurement_kit/internal/vendor/mkbouncer.hpp +include/measurement_kit/internal/vendor/mkcollector.hpp +include/measurement_kit/internal/vendor/mkcurl.hpp +include/measurement_kit/internal/vendor/mkdata.hpp +include/measurement_kit/internal/vendor/mkgeoip.hpp +include/measurement_kit/internal/vendor/mkiplookup.hpp +include/measurement_kit/internal/vendor/mkmmdb.hpp +include/measurement_kit/internal/vendor/mkmock.hpp +include/measurement_kit/internal/vendor/mkreport.hpp +include/measurement_kit/internal/vendor/mkuuid4.hpp include/measurement_kit/ndt.hpp include/measurement_kit/nettests.hpp -include/measurement_kit/vendor/README.md -include/measurement_kit/vendor/mkcurl.h -include/measurement_kit/vendor/mkdata.h -include/measurement_kit/vendor/mkgeoip.h -include/measurement_kit/vendor/mkiplookup.h -include/measurement_kit/vendor/mkmmdb.h lib/libmeasurement_kit.a diff --git a/net/p5-MaxMind-DB-Reader-XS/Makefile b/net/p5-MaxMind-DB-Reader-XS/Makefile index f9d59befa92..bfdfd870372 100644 --- a/net/p5-MaxMind-DB-Reader-XS/Makefile +++ b/net/p5-MaxMind-DB-Reader-XS/Makefile @@ -32,6 +32,8 @@ TEST_DEPENDS= p5-Module-Implementation>=0:devel/p5-Module-Implementation \ USES= compiler:c11 perl5 USE_PERL5= modbuild +CONFIGURE_ENV= CC=${CC} + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/MaxMind/DB/Reader/XS/XS.so diff --git a/net/rubygem-gitaly-proto/Makefile b/net/rubygem-gitaly-proto/Makefile index 2b7d15c52b6..1224582626a 100644 --- a/net/rubygem-gitaly-proto/Makefile +++ b/net/rubygem-gitaly-proto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitaly-proto -PORTVERSION= 1.13.0 +PORTVERSION= 1.19.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly-proto/distinfo b/net/rubygem-gitaly-proto/distinfo index 36dc0cd38bf..42aa83f9b10 100644 --- a/net/rubygem-gitaly-proto/distinfo +++ b/net/rubygem-gitaly-proto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553170595 -SHA256 (rubygem/gitaly-proto-1.13.0.gem) = 764ae63a8d4d427769d3c78a5de6a4aed8d012c2dc8be6d22170f74c15723fe0 -SIZE (rubygem/gitaly-proto-1.13.0.gem) = 17920 +TIMESTAMP = 1555691070 +SHA256 (rubygem/gitaly-proto-1.19.0.gem) = 61d77d8a04ee33cc03c59dffdafb147f0f011e6dcb533c7e5c15e3dd7a32679c +SIZE (rubygem/gitaly-proto-1.19.0.gem) = 18432 diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 042e9e54610..f76a6d13667 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -4,7 +4,7 @@ PORTNAME= scapy PORTVERSION= 2.4.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/scapy/files/1991.patch b/net/scapy/files/patch-1991.patch similarity index 100% rename from net/scapy/files/1991.patch rename to net/scapy/files/patch-1991.patch diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index bfd4680bf47..3877c535cef 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -3,7 +3,7 @@ PORTNAME= ssvnc PORTVERSION= 1.0.29 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net security MASTER_SITES= SF EXTRACT_SUFX= .src.tar.gz @@ -36,11 +36,6 @@ ULTRAFTP_MAKE_ARGS_OFF= JSRC="" .include -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= variable has incomplete type 'EVP_CIPHER_CTX' (aka 'struct evp_cipher_ctx_st') -BROKEN_FreeBSD_13= variable has incomplete type 'EVP_CIPHER_CTX' (aka 'struct evp_cipher_ctx_st') -.endif - post-patch: @${REINPLACE_CMD} -e 's|netstat -ant|netstat -an|' \ ${WRKSRC}/scripts/util/ss_vncviewer diff --git a/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c b/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c index 0521cc4adf0..2c37647d074 100644 --- a/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c +++ b/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c @@ -1,13 +1,199 @@ ---- vncstorepw/ultravnc_dsm_helper.c.orig 2010-04-23 04:29:43 UTC +--- vncstorepw/ultravnc_dsm_helper.c +++ vncstorepw/ultravnc_dsm_helper.c -@@ -413,8 +413,10 @@ void enc_do(char *ciph, char *keyfile, c - p++; +@@ -414,7 +414,9 @@ void enc_do(char *ciph, char *keyfile, c if (strstr(p, "md5+") == p) { Digest = EVP_md5(); p += strlen("md5+"); -+#ifndef OPENSSL_NO_SHA0 } else if (strstr(p, "sha+") == p) { - Digest = EVP_sha(); p += strlen("sha+"); -+#endif +- Digest = EVP_sha(); p += strlen("sha+"); ++ fprintf(stderr, "%s: obsolete hash algorithm: SHA-0\n", ++ prog, s); ++ exit(1); } else if (strstr(p, "sha1+") == p) { Digest = EVP_sha1(); p += strlen("sha1+"); } else if (strstr(p, "ripe+") == p) { +@@ -655,8 +657,10 @@ static void enc_xfer(int sock_fr, int so + */ + unsigned char E_keystr[EVP_MAX_KEY_LENGTH]; + unsigned char D_keystr[EVP_MAX_KEY_LENGTH]; +- EVP_CIPHER_CTX E_ctx, D_ctx; +- EVP_CIPHER_CTX *ctx = NULL; ++ //openssl1.1.patch - Do NOT create two context and only use one ++ // - that's silly. ++ //EVP_CIPHER_CTX *E_ctx, *D_ctx; ++ EVP_CIPHER_CTX *ctx; + + unsigned char buf[BSIZE], out[BSIZE]; + unsigned char *psrc = NULL, *keystr; +@@ -698,11 +702,14 @@ static void enc_xfer(int sock_fr, int so + encsym = encrypt ? "+" : "-"; + + /* use the encryption/decryption context variables below */ ++ ctx = EVP_CIPHER_CTX_new(); ++ if (!ctx) { ++ fprintf(stderr, "Failed to create encryption/decryption context.\n"); ++ goto finished; ++ } + if (encrypt) { +- ctx = &E_ctx; + keystr = E_keystr; + } else { +- ctx = &D_ctx; + keystr = D_keystr; + } + +@@ -797,7 +804,6 @@ static void enc_xfer(int sock_fr, int so + if (whoops) { + fprintf(stderr, "%s: %s - WARNING: MSRC4 mode and IGNORING random salt\n", prog, encstr); + fprintf(stderr, "%s: %s - WARNING: and initialization vector!!\n", prog, encstr); +- EVP_CIPHER_CTX_init(ctx); + if (pw_in) { + /* for pw=xxxx a md5 hash is used */ + EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata, +@@ -816,7 +822,6 @@ static void enc_xfer(int sock_fr, int so + + EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata, + keydata_len, 1, keystr, ivec); +- EVP_CIPHER_CTX_init(ctx); + EVP_CipherInit_ex(ctx, Cipher, NULL, keystr, ivec, + encrypt); + } +@@ -836,9 +841,9 @@ static void enc_xfer(int sock_fr, int so + in_salt = salt; + } + +- if (ivec_size < Cipher->iv_len && !securevnc) { ++ if (ivec_size < EVP_CIPHER_iv_length(Cipher) && !securevnc) { + fprintf(stderr, "%s: %s - WARNING: short IV %d < %d\n", +- prog, encstr, ivec_size, Cipher->iv_len); ++ prog, encstr, ivec_size, EVP_CIPHER_iv_length(Cipher)); + } + + /* make the hashed value and place in keystr */ +@@ -877,9 +882,6 @@ static void enc_xfer(int sock_fr, int so + } + + +- /* initialize the context */ +- EVP_CIPHER_CTX_init(ctx); +- + + /* set the cipher & initialize */ + +@@ -986,6 +988,7 @@ static void enc_xfer(int sock_fr, int so + /* transfer done (viewer exited or some error) */ + finished: + ++ if (ctx) EVP_CIPHER_CTX_free(ctx); + fprintf(stderr, "\n%s: %s - close sock_to\n", prog, encstr); + close(sock_to); + +@@ -1060,14 +1063,14 @@ static int securevnc_server_rsa_save_dia + } + + static char *rsa_md5_sum(unsigned char* rsabuf) { +- EVP_MD_CTX md; ++ EVP_MD_CTX *md = EVP_MD_CTX_create(); + char digest[EVP_MAX_MD_SIZE], tmp[16]; + char md5str[EVP_MAX_MD_SIZE * 8]; + unsigned int i, size = 0; + +- EVP_DigestInit(&md, EVP_md5()); +- EVP_DigestUpdate(&md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE); +- EVP_DigestFinal(&md, (unsigned char *)digest, &size); ++ EVP_DigestInit(md, EVP_md5()); ++ EVP_DigestUpdate(md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE); ++ EVP_DigestFinal(md, (unsigned char *)digest, &size); + + memset(md5str, 0, sizeof(md5str)); + for (i=0; i < size; i++) { +@@ -1075,6 +1078,7 @@ static char *rsa_md5_sum(unsigned char* + sprintf(tmp, "%02x", (int) uc); + strcat(md5str, tmp); + } ++ EVP_MD_CTX_destroy(md); + return strdup(md5str); + } + +@@ -1184,7 +1188,7 @@ static void sslexit(char *msg) { + + static void securevnc_setup(int conn1, int conn2) { + RSA *rsa = NULL; +- EVP_CIPHER_CTX init_ctx; ++ EVP_CIPHER_CTX *init_ctx = EVP_CIPHER_CTX_new(); + unsigned char keystr[EVP_MAX_KEY_LENGTH]; + unsigned char *rsabuf, *rsasav; + unsigned char *encrypted_keybuf; +@@ -1203,6 +1207,8 @@ static void securevnc_setup(int conn1, i + + ERR_load_crypto_strings(); + ++ if (!init_ctx) sslexit("securevnc_setup: EVP_CIPHER_CTX_new() failed"); ++ + /* alloc and read from server the 270 comprising the rsa public key: */ + rsabuf = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1); + rsasav = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1); +@@ -1323,8 +1329,7 @@ static void securevnc_setup(int conn1, i + /* + * Back to the work involving the tmp obscuring key: + */ +- EVP_CIPHER_CTX_init(&init_ctx); +- rc = EVP_CipherInit_ex(&init_ctx, EVP_rc4(), NULL, initkey, NULL, 1); ++ rc = EVP_CipherInit_ex(init_ctx, EVP_rc4(), NULL, initkey, NULL, 1); + if (rc == 0) { + sslexit("securevnc_setup: EVP_CipherInit_ex(init_ctx) failed"); + } +@@ -1340,13 +1345,13 @@ static void securevnc_setup(int conn1, i + /* decode with the tmp key */ + if (n > 0) { + memset(to_viewer, 0, sizeof(to_viewer)); +- if (EVP_CipherUpdate(&init_ctx, to_viewer, &len, buf, n) == 0) { ++ if (EVP_CipherUpdate(init_ctx, to_viewer, &len, buf, n) == 0) { + sslexit("securevnc_setup: EVP_CipherUpdate(init_ctx) failed"); + exit(1); + } + to_viewer_len = len; + } +- EVP_CIPHER_CTX_cleanup(&init_ctx); ++ EVP_CIPHER_CTX_free(init_ctx); + free(initkey); + + /* print what we would send to the viewer (sent below): */ +@@ -1407,7 +1412,7 @@ static void securevnc_setup(int conn1, i + + if (client_auth_req && client_auth) { + RSA *client_rsa = load_client_auth(client_auth); +- EVP_MD_CTX dctx; ++ EVP_MD_CTX *dctx = EVP_MD_CTX_create(); + unsigned char digest[EVP_MAX_MD_SIZE], *signature; + unsigned int ndig = 0, nsig = 0; + +@@ -1421,8 +1426,8 @@ static void securevnc_setup(int conn1, i + exit(1); + } + +- EVP_DigestInit(&dctx, EVP_sha1()); +- EVP_DigestUpdate(&dctx, keystr, SECUREVNC_KEY_SIZE); ++ EVP_DigestInit(dctx, EVP_sha1()); ++ EVP_DigestUpdate(dctx, keystr, SECUREVNC_KEY_SIZE); + /* + * Without something like the following MITM is still possible. + * This is because the MITM knows keystr and can use it with +@@ -1433,7 +1438,7 @@ static void securevnc_setup(int conn1, i + * he doesn't have Viewer_ClientAuth.pkey. + */ + if (0) { +- EVP_DigestUpdate(&dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE); ++ EVP_DigestUpdate(dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE); + if (!keystore_verified) { + fprintf(stderr, "securevnc_setup:\n"); + fprintf(stderr, "securevnc_setup: Warning: even *WITH* Client Authentication in SecureVNC,\n"); +@@ -1456,7 +1461,8 @@ static void securevnc_setup(int conn1, i + fprintf(stderr, "securevnc_setup:\n"); + } + } +- EVP_DigestFinal(&dctx, (unsigned char *)digest, &ndig); ++ EVP_DigestFinal(dctx, (unsigned char *)digest, &ndig); ++ EVP_MD_CTX_destroy(dctx); + + signature = (unsigned char *) calloc(RSA_size(client_rsa), 1); + RSA_sign(NID_sha1, digest, ndig, signature, &nsig, client_rsa); diff --git a/net/termshark/Makefile b/net/termshark/Makefile new file mode 100644 index 00000000000..a428a32292b --- /dev/null +++ b/net/termshark/Makefile @@ -0,0 +1,100 @@ +# Created by: Ryan Steinmetz +# $FreeBSD$ + +PORTNAME= termshark +PORTVERSION= 1.0.0 +DISTVERSIONPREFIX=v +CATEGORIES= net + +MAINTAINER= zi@FreeBSD.org +COMMENT= Terminal UI for tshark, inspired by Wireshark + +LICENSE= MIT + +RUN_DEPENDS= tshark>0:net/tshark + +USES= go +USE_GITHUB= yes + +GH_ACCOUNT= gcla +GH_TUPLE= blang:semver:v3.6.1:semver \ + gcla:gowid:v1.0.0:gowid \ + gcla:deep:v1.0.2:deep \ + pkg:errors:v0.8.1:pkgerrors \ + shibukawa:configdir:e180dbd:configdir \ + sirupsen:logrus:v1.4.1:logrus \ + spf13:viper:v1.3.2:viper \ + fsnotify:fsnotify:v1.4.7:fsnotify \ + go-yaml:yaml:7f97868:go_yaml \ + gdamore:tcell:v1.1.1:tcell \ + gdamore:encoding:v1.0.0:encoding \ + hashicorp:golang-lru:v0.5.1:golanglru \ + hashicorp:hcl:v1.0.0:hcl \ + magiconair:properties:v1.8.0:properties \ + mitchellh:mapstructure:v1.1.2:mapstructure \ + pelletier:go-toml:v1.3.0:gotoml \ + spf13:afero:v1.2.2:afero \ + spf13:cast:v1.3.0:cast \ + spf13:pflag:v1.0.3:pflag \ + spf13:jwalterweatherman:v1.1.0:jwalterweatherman \ + lucasb-eyer:go-colorful:v1.0.2:colorful \ + mattn:go-runewidth:v0.0.4:runewidth \ + mattn:go-isatty:v0.0.7:isatty \ + jessevdk:go-flags:v1.4.0:goflags \ + golang:text:v0.3.0:text + +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME}/cmd/${PORTNAME} + +PLIST_FILES= bin/${PORTNAME} + +pre-build: + ${MKDIR} ${GO_WRKDIR_SRC}/github.com/blang \ + ${GO_WRKDIR_SRC}/github.com/gcla \ + ${GO_WRKDIR_SRC}/github.com/pkg \ + ${GO_WRKDIR_SRC}/github.com/shibukawa \ + ${GO_WRKDIR_SRC}/github.com/sirupsen \ + ${GO_WRKDIR_SRC}/github.com/spf13 \ + ${GO_WRKDIR_SRC}/github.com/fsnotify \ + ${GO_WRKDIR_SRC}/gopkg.in \ + ${GO_WRKDIR_SRC}/github.com/go-yaml \ + ${GO_WRKDIR_SRC}/github.com/gdamore \ + ${GO_WRKDIR_SRC}/github.com/hashicorp \ + ${GO_WRKDIR_SRC}/github.com/magiconair \ + ${GO_WRKDIR_SRC}/github.com/mitchellh \ + ${GO_WRKDIR_SRC}/github.com/pelletier \ + ${GO_WRKDIR_SRC}/github.com/fsnotify \ + ${GO_WRKDIR_SRC}/github.com/golang \ + ${GO_WRKDIR_SRC}/github.com/mattn \ + ${GO_WRKDIR_SRC}/github.com/lucasb-eyer \ + ${GO_WRKDIR_SRC}/github.com/jessevdk \ + ${GO_WRKDIR_SRC}/golang.org/x + ${MV} ${WRKSRC_semver} ${GO_WRKDIR_SRC}/github.com/blang/semver + ${MV} ${WRKSRC_deep} ${GO_WRKDIR_SRC}/github.com/gcla/deep + ${MV} ${WRKSRC_gowid} ${GO_WRKDIR_SRC}/github.com/gcla/gowid + ${MV} ${WRKSRC_pkgerrors} ${GO_WRKDIR_SRC}/github.com/pkg/errors + ${MV} ${WRKSRC_configdir} ${GO_WRKDIR_SRC}/github.com/shibukawa/configdir + ${MV} ${WRKSRC_logrus} ${GO_WRKDIR_SRC}/github.com/sirupsen/logrus + ${MV} ${WRKSRC_viper} ${GO_WRKDIR_SRC}/github.com/spf13/viper + ${MV} ${WRKSRC_fsnotify} ${GO_WRKDIR_SRC}/gopkg.in/fsnotify.v1 + (cd ${GO_WRKDIR_SRC}/github.com/fsnotify && ${LN} -s ../../gopkg.in/fsnotify.v1 fsnotify) + ${MV} ${WRKSRC_go_yaml} ${GO_WRKDIR_SRC}/gopkg.in/yaml.v2 + ${MV} ${WRKSRC_encoding} ${GO_WRKDIR_SRC}/github.com/gdamore/encoding + ${MV} ${WRKSRC_tcell} ${GO_WRKDIR_SRC}/github.com/gdamore/tcell + ${MV} ${WRKSRC_golanglru} ${GO_WRKDIR_SRC}/github.com/hashicorp/golang-lru + ${MV} ${WRKSRC_hcl} ${GO_WRKDIR_SRC}/github.com/hashicorp/hcl + ${MV} ${WRKSRC_properties} ${GO_WRKDIR_SRC}/github.com/magiconair/properties + ${MV} ${WRKSRC_mapstructure} ${GO_WRKDIR_SRC}/github.com/mitchellh/mapstructure + ${MV} ${WRKSRC_gotoml} ${GO_WRKDIR_SRC}/github.com/pelletier/go-toml + ${MV} ${WRKSRC_afero} ${GO_WRKDIR_SRC}/github.com/spf13/afero + ${MV} ${WRKSRC_cast} ${GO_WRKDIR_SRC}/github.com/spf13/cast + ${MV} ${WRKSRC_pflag} ${GO_WRKDIR_SRC}/github.com/spf13/pflag + ${MV} ${WRKSRC_jwalterweatherman} ${GO_WRKDIR_SRC}/github.com/spf13/jwalterweatherman + ${MV} ${WRKSRC_colorful} ${GO_WRKDIR_SRC}/github.com/lucasb-eyer/go-colorful + ${MV} ${WRKSRC_runewidth} ${GO_WRKDIR_SRC}/github.com/mattn/go-runewidth + ${MV} ${WRKSRC_isatty} ${GO_WRKDIR_SRC}/github.com/mattn/go-isatty + ${MV} ${WRKSRC_text} ${GO_WRKDIR_SRC}/golang.org/x/text + ${MV} ${WRKSRC_goflags} ${GO_WRKDIR_SRC}/github.com/jessevdk/go-flags + (cd ${GO_WRKDIR_SRC}/golang.org/x && ${LN} -s ${LOCALBASE}/go/src/cmd/vendor/golang.org/x/sys sys) + +.include diff --git a/net/termshark/distinfo b/net/termshark/distinfo new file mode 100644 index 00000000000..7c816490298 --- /dev/null +++ b/net/termshark/distinfo @@ -0,0 +1,53 @@ +TIMESTAMP = 1556030629 +SHA256 (gcla-termshark-v1.0.0_GH0.tar.gz) = 669bba0e8dd7df54ade6321a5c7d2ec20563ffd777f7b3b0394a11f88da64698 +SIZE (gcla-termshark-v1.0.0_GH0.tar.gz) = 110518 +SHA256 (blang-semver-v3.6.1_GH0.tar.gz) = dc85076e7c5a7a44e33fc24df320904b95e2fa12c94a3ac758a574dadd54ee53 +SIZE (blang-semver-v3.6.1_GH0.tar.gz) = 15410 +SHA256 (gcla-gowid-v1.0.0_GH0.tar.gz) = 8d7bf6bf43cc0ec28ca7da73ebecd73a4c241084986ec368985d334d6f49a9ce +SIZE (gcla-gowid-v1.0.0_GH0.tar.gz) = 249052 +SHA256 (gcla-deep-v1.0.2_GH0.tar.gz) = bfc22031a2325577648af566eafbec7a97110541be3954fc2a6da06386cd6c8b +SIZE (gcla-deep-v1.0.2_GH0.tar.gz) = 7938 +SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 +SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009 +SHA256 (shibukawa-configdir-e180dbd_GH0.tar.gz) = e53129a751ec065e5db1b446d12941b7f6835b5039b5f376a4a54b978542f45b +SIZE (shibukawa-configdir-e180dbd_GH0.tar.gz) = 3779 +SHA256 (sirupsen-logrus-v1.4.1_GH0.tar.gz) = aecd75cfc00edfc8d8bdb013d2cee2a5da686fce31c5cf2ae314ce4642c8e139 +SIZE (sirupsen-logrus-v1.4.1_GH0.tar.gz) = 40811 +SHA256 (spf13-viper-v1.3.2_GH0.tar.gz) = 3eb6e09dc9de3d46ad659b97774afa3f27b560b642ca025bee04d14b5aad3b16 +SIZE (spf13-viper-v1.3.2_GH0.tar.gz) = 36932 +SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd +SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139 +SHA256 (go-yaml-yaml-7f97868_GH0.tar.gz) = b0215657c82db81fa1e10f73fb1df3db12715ec68a14ab555e7f40d1d174132d +SIZE (go-yaml-yaml-7f97868_GH0.tar.gz) = 69163 +SHA256 (gdamore-tcell-v1.1.1_GH0.tar.gz) = 159c90379018862be4b2e75071f3b2e8c56e6dfcbece0694ab4009ef25035a4f +SIZE (gdamore-tcell-v1.1.1_GH0.tar.gz) = 745779 +SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013 +SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886 +SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e +SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982 +SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2 +SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658 +SHA256 (magiconair-properties-v1.8.0_GH0.tar.gz) = f6c732fe6031e2cf72c6eb6d6ce50cde8f72d254c3a26f42e373c598870616ed +SIZE (magiconair-properties-v1.8.0_GH0.tar.gz) = 29504 +SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b +SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980 +SHA256 (pelletier-go-toml-v1.3.0_GH0.tar.gz) = 731d6cfb21a70177e3e55998eabf86020aad768179bfc5ec52d3fd2d9877992c +SIZE (pelletier-go-toml-v1.3.0_GH0.tar.gz) = 71949 +SHA256 (spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b74f97fe0c88c63f911d1020570 +SIZE (spf13-afero-v1.2.2_GH0.tar.gz) = 46157 +SHA256 (spf13-cast-v1.3.0_GH0.tar.gz) = e685282ea33f89e9354d148ad1886f532bcebe86b0b60a167988f7c6d081085f +SIZE (spf13-cast-v1.3.0_GH0.tar.gz) = 11085 +SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124 +SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002 +SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d +SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871 +SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140 +SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545 +SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe +SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827 +SHA256 (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 80b6b3e4fee3b15864f23d622129c17ba222786f8c93bb01f8805f3cb91dfefe +SIZE (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 3559 +SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611 +SIZE (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 55452 +SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb +SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 diff --git a/net/termshark/pkg-descr b/net/termshark/pkg-descr new file mode 100644 index 00000000000..486638d8116 --- /dev/null +++ b/net/termshark/pkg-descr @@ -0,0 +1,6 @@ +Termshark is a simple terminal user-interface for tshark with the ability to: +* Read pcap files or sniff live interfaces. +* Use Wireshark's display filters. +* Copy packet data to your clipboard. + +WWW: https://termshark.io/ diff --git a/science/sparta/Makefile b/science/sparta/Makefile index f6416968ff6..de2a7743413 100644 --- a/science/sparta/Makefile +++ b/science/sparta/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= bash:shells/bash USES= gmake localbase USE_GITHUB= yes -GH_TAGNAME= 15Feb2019 +GH_TAGNAME= 16Apr2019 CXXFLAGS+= -DSPARTA_UNORDERED_MAP diff --git a/science/sparta/distinfo b/science/sparta/distinfo index 81acab2a0e7..83ec5fd8411 100644 --- a/science/sparta/distinfo +++ b/science/sparta/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552750566 -SHA256 (sparta-sparta-2019.02.15-15Feb2019_GH0.tar.gz) = 7218a8fb897baab782310299a7f7e21035abbe1d2af09e98431dc90c83c29e04 -SIZE (sparta-sparta-2019.02.15-15Feb2019_GH0.tar.gz) = 20405901 +TIMESTAMP = 1556122440 +SHA256 (sparta-sparta-2019.04.16-16Apr2019_GH0.tar.gz) = 017e60f05ff2ff9dafaf43cb2b39618c1fbacbaf0455304011545b8661c09ecc +SIZE (sparta-sparta-2019.04.16-16Apr2019_GH0.tar.gz) = 20432095 diff --git a/security/Makefile b/security/Makefile index dc2e176f347..59ed884b50a 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1173,7 +1173,6 @@ PORTREVISION= 1 SUBDIR += rubygem-pundit SUBDIR += rubygem-pyu-ruby-sasl SUBDIR += rubygem-rack-oauth2 - SUBDIR += rubygem-rack-oauth212 SUBDIR += rubygem-razorback-scriptNugget SUBDIR += rubygem-rbnacl SUBDIR += rubygem-rbnacl-libsodium diff --git a/security/clamfs/Makefile b/security/clamfs/Makefile index fe159c4af75..3c377a08992 100644 --- a/security/clamfs/Makefile +++ b/security/clamfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= clamfs PORTVERSION= 1.0.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= security MASTER_SITES= SF @@ -16,7 +16,7 @@ BROKEN_armv6= fails to compile: ./config.hxx:52:17: expected namespace name BROKEN_armv7= fails to compile: ./config.hxx:52:17: expected namespace name LIB_DEPENDS= libccgnu2.so:devel/commoncpp \ - libPocoNet.so:devel/poco-ssl \ + libPocoNet.so:devel/poco \ librlog.so:devel/rlog BUILD_DEPENDS= boost-libs>=1.33:devel/boost-libs RUN_DEPENDS= clamd:security/clamav diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile index b0806f53244..412bd93b981 100644 --- a/security/gost-engine/Makefile +++ b/security/gost-engine/Makefile @@ -18,7 +18,10 @@ BROKEN_SSL_REASON_openssl= needs features only available in OpenSSL 1.1.1+ USES= cmake ssl -CMAKE_ARGS+= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} +ENGINESDIR?= ${PREFIX}/lib/engines-1.1 + +CMAKE_ARGS+= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ + -DOPENSSL_ENGINES_DIR=${ENGINESDIR} USE_GITHUB= yes GH_ACCOUNT= gost-engine diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index d95ce3a35e8..1f5b966af36 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libressl -PORTVERSION= 2.9.0 +PORTVERSION= 2.9.1 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL PKGNAMESUFFIX= -devel @@ -15,10 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING CPE_VENDOR= openbsd -OPTIONS_DEFINE= MAN3 NC +OPTIONS_DEFINE= MAN3 NC TLS1_3 OPTIONS_DEFAULT= MAN3 NC MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat +TLS1_3_DESC= TLSv1.3 support (experimental) CONFLICTS_INSTALL= libressl-[0-9]* \ openssl-[0-9]* \ @@ -41,6 +42,10 @@ post-patch-MAN3-off: -e '/$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook/d' \ ${WRKSRC}/man/Makefile.in +post-patch-TLS1_3-on: + ${REINPLACE_CMD} 's|/\* \(#define LIBRESSL_HAS_TLS1_3\) \*/|\1|' \ + ${WRKSRC}/include/openssl/opensslfeatures.h + post-install: ${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem diff --git a/security/libressl-devel/distinfo b/security/libressl-devel/distinfo index f4eb676c131..6e568b3897e 100644 --- a/security/libressl-devel/distinfo +++ b/security/libressl-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544955712 -SHA256 (libressl-2.9.0.tar.gz) = eb5f298408b723f11a0ca0192c122ecb79b4855bfdf7eea183a6264296a13cf4 -SIZE (libressl-2.9.0.tar.gz) = 3400383 +TIMESTAMP = 1555942276 +SHA256 (libressl-2.9.1.tar.gz) = 39e4dd856694dc10d564201e4549c46d2431601a2b10f3422507e24ccc8f62f8 +SIZE (libressl-2.9.1.tar.gz) = 3607116 diff --git a/security/libressl-devel/pkg-plist b/security/libressl-devel/pkg-plist index 48038306149..c6bde6c0898 100644 --- a/security/libressl-devel/pkg-plist +++ b/security/libressl-devel/pkg-plist @@ -58,6 +58,7 @@ include/openssl/rsa.h include/openssl/safestack.h include/openssl/sha.h include/openssl/sm3.h +include/openssl/sm4.h include/openssl/srtp.h include/openssl/ssl.h include/openssl/ssl2.h @@ -77,15 +78,15 @@ include/tls.h lib/libcrypto.a lib/libcrypto.so lib/libcrypto.so.45 -lib/libcrypto.so.45.0.1 +lib/libcrypto.so.45.0.4 lib/libssl.a lib/libssl.so lib/libssl.so.47 -lib/libssl.so.47.0.1 +lib/libssl.so.47.0.5 lib/libtls.a lib/libtls.so lib/libtls.so.19 -lib/libtls.so.19.0.2 +lib/libtls.so.19.0.6 libdata/pkgconfig/libcrypto.pc libdata/pkgconfig/libssl.pc libdata/pkgconfig/libtls.pc @@ -546,7 +547,6 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz %%MAN3%%man/man3/CRYPTO_set_dynlock_lock_callback.3.gz %%MAN3%%man/man3/CRYPTO_set_ex_data.3.gz -%%MAN3%%man/man3/CRYPTO_set_locking_callback.3.gz %%MAN3%%man/man3/CRYPTO_set_mem_functions.3.gz %%MAN3%%man/man3/CRYPTO_strdup.3.gz %%MAN3%%man/man3/CRYPTO_w_lock.3.gz @@ -664,6 +664,9 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/DSAparams_dup.3.gz %%MAN3%%man/man3/DSAparams_print.3.gz %%MAN3%%man/man3/DSAparams_print_fp.3.gz +%%MAN3%%man/man3/DTLS_client_method.3.gz +%%MAN3%%man/man3/DTLS_method.3.gz +%%MAN3%%man/man3/DTLS_server_method.3.gz %%MAN3%%man/man3/DTLSv1_client_method.3.gz %%MAN3%%man/man3/DTLSv1_listen.3.gz %%MAN3%%man/man3/DTLSv1_method.3.gz @@ -967,6 +970,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_block_size.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_cipher.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_cleanup.3.gz +%%MAN3%%man/man3/EVP_CIPHER_CTX_clear_flags.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_ctrl.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_flags.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_free.3.gz @@ -981,9 +985,11 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_rand_key.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_reset.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_set_app_data.3.gz +%%MAN3%%man/man3/EVP_CIPHER_CTX_set_flags.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_set_iv.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_set_key_length.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_set_padding.3.gz +%%MAN3%%man/man3/EVP_CIPHER_CTX_test_flags.3.gz %%MAN3%%man/man3/EVP_CIPHER_CTX_type.3.gz %%MAN3%%man/man3/EVP_CIPHER_asn1_to_param.3.gz %%MAN3%%man/man3/EVP_CIPHER_block_size.3.gz @@ -1019,6 +1025,8 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_DigestVerifyFinal.3.gz %%MAN3%%man/man3/EVP_DigestVerifyInit.3.gz %%MAN3%%man/man3/EVP_DigestVerifyUpdate.3.gz +%%MAN3%%man/man3/EVP_ENCODE_CTX_free.3.gz +%%MAN3%%man/man3/EVP_ENCODE_CTX_new.3.gz %%MAN3%%man/man3/EVP_EncodeBlock.3.gz %%MAN3%%man/man3/EVP_EncodeFinal.3.gz %%MAN3%%man/man3/EVP_EncodeInit.3.gz @@ -1057,6 +1065,9 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_PKEY_CTX_get_app_data.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_get_cb.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_get_keygen_info.3.gz +%%MAN3%%man/man3/EVP_PKEY_CTX_get_rsa_mgf1_md.3.gz +%%MAN3%%man/man3/EVP_PKEY_CTX_get_rsa_padding.3.gz +%%MAN3%%man/man3/EVP_PKEY_CTX_get_rsa_pss_saltlen.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_new.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_new_id.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_set_app_data.3.gz @@ -1067,6 +1078,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_PKEY_CTX_set_ec_paramgen_curve_nid.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_bits.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_pubexp.3.gz +%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_mgf1_md.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_padding.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_pss_saltlen.3.gz %%MAN3%%man/man3/EVP_PKEY_CTX_set_signature_md.3.gz @@ -1108,6 +1120,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_PKEY_get0_EC_KEY.3.gz %%MAN3%%man/man3/EVP_PKEY_get0_RSA.3.gz %%MAN3%%man/man3/EVP_PKEY_get0_asn1.3.gz +%%MAN3%%man/man3/EVP_PKEY_get0_hmac.3.gz %%MAN3%%man/man3/EVP_PKEY_get1_DH.3.gz %%MAN3%%man/man3/EVP_PKEY_get1_DSA.3.gz %%MAN3%%man/man3/EVP_PKEY_get1_EC_KEY.3.gz @@ -1138,6 +1151,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_PKEY_meth_set_verifyctx.3.gz %%MAN3%%man/man3/EVP_PKEY_missing_parameters.3.gz %%MAN3%%man/man3/EVP_PKEY_new.3.gz +%%MAN3%%man/man3/EVP_PKEY_new_mac_key.3.gz %%MAN3%%man/man3/EVP_PKEY_paramgen.3.gz %%MAN3%%man/man3/EVP_PKEY_paramgen_init.3.gz %%MAN3%%man/man3/EVP_PKEY_print_params.3.gz @@ -1170,30 +1184,50 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_aead_aes_128_gcm.3.gz %%MAN3%%man/man3/EVP_aead_aes_256_gcm.3.gz %%MAN3%%man/man3/EVP_aead_chacha20_poly1305.3.gz +%%MAN3%%man/man3/EVP_aead_chacha20_poly1305.gz +%%MAN3%%man/man3/EVP_aead_xchacha20_poly1305.3.gz %%MAN3%%man/man3/EVP_aes_128_cbc.3.gz %%MAN3%%man/man3/EVP_aes_128_cbc_hmac_sha1.3.gz %%MAN3%%man/man3/EVP_aes_128_ccm.3.gz %%MAN3%%man/man3/EVP_aes_128_cfb.3.gz +%%MAN3%%man/man3/EVP_aes_128_cfb1.3.gz +%%MAN3%%man/man3/EVP_aes_128_cfb128.3.gz +%%MAN3%%man/man3/EVP_aes_128_cfb8.3.gz +%%MAN3%%man/man3/EVP_aes_128_ctr.3.gz %%MAN3%%man/man3/EVP_aes_128_ecb.3.gz %%MAN3%%man/man3/EVP_aes_128_gcm.3.gz %%MAN3%%man/man3/EVP_aes_128_ofb.3.gz +%%MAN3%%man/man3/EVP_aes_128_wrap.3.gz +%%MAN3%%man/man3/EVP_aes_128_xts.3.gz %%MAN3%%man/man3/EVP_aes_192_cbc.3.gz %%MAN3%%man/man3/EVP_aes_192_ccm.3.gz %%MAN3%%man/man3/EVP_aes_192_cfb.3.gz +%%MAN3%%man/man3/EVP_aes_192_cfb1.3.gz +%%MAN3%%man/man3/EVP_aes_192_cfb128.3.gz +%%MAN3%%man/man3/EVP_aes_192_cfb8.3.gz +%%MAN3%%man/man3/EVP_aes_192_ctr.3.gz %%MAN3%%man/man3/EVP_aes_192_ecb.3.gz %%MAN3%%man/man3/EVP_aes_192_gcm.3.gz %%MAN3%%man/man3/EVP_aes_192_ofb.3.gz +%%MAN3%%man/man3/EVP_aes_192_wrap.3.gz %%MAN3%%man/man3/EVP_aes_256_cbc.3.gz %%MAN3%%man/man3/EVP_aes_256_cbc_hmac_sha1.3.gz %%MAN3%%man/man3/EVP_aes_256_ccm.3.gz %%MAN3%%man/man3/EVP_aes_256_cfb.3.gz +%%MAN3%%man/man3/EVP_aes_256_cfb1.3.gz +%%MAN3%%man/man3/EVP_aes_256_cfb128.3.gz +%%MAN3%%man/man3/EVP_aes_256_cfb8.3.gz +%%MAN3%%man/man3/EVP_aes_256_ctr.3.gz %%MAN3%%man/man3/EVP_aes_256_ecb.3.gz %%MAN3%%man/man3/EVP_aes_256_gcm.3.gz %%MAN3%%man/man3/EVP_aes_256_ofb.3.gz +%%MAN3%%man/man3/EVP_aes_256_wrap.3.gz +%%MAN3%%man/man3/EVP_aes_256_xts.3.gz %%MAN3%%man/man3/EVP_bf_cbc.3.gz %%MAN3%%man/man3/EVP_bf_cfb.3.gz %%MAN3%%man/man3/EVP_bf_ecb.3.gz %%MAN3%%man/man3/EVP_bf_ofb.3.gz +%%MAN3%%man/man3/EVP_camellia_128_cbc.3.gz %%MAN3%%man/man3/EVP_cast5_cbc.3.gz %%MAN3%%man/man3/EVP_cast5_cfb.3.gz %%MAN3%%man/man3/EVP_cast5_ecb.3.gz @@ -1245,6 +1279,12 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/EVP_sha256.3.gz %%MAN3%%man/man3/EVP_sha384.3.gz %%MAN3%%man/man3/EVP_sha512.3.gz +%%MAN3%%man/man3/EVP_sm4_cbc.3.gz +%%MAN3%%man/man3/EVP_sm4_cfb.3.gz +%%MAN3%%man/man3/EVP_sm4_cfb128.3.gz +%%MAN3%%man/man3/EVP_sm4_ctr.3.gz +%%MAN3%%man/man3/EVP_sm4_ecb.3.gz +%%MAN3%%man/man3/EVP_sm4_ofb.3.gz %%MAN3%%man/man3/EXTENDED_KEY_USAGE_free.3.gz %%MAN3%%man/man3/EXTENDED_KEY_USAGE_new.3.gz %%MAN3%%man/man3/GENERAL_NAMES_free.3.gz @@ -1338,6 +1378,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/OCSP_SINGLERESP_new.3.gz %%MAN3%%man/man3/OCSP_basic_add1_nonce.3.gz %%MAN3%%man/man3/OCSP_basic_sign.3.gz +%%MAN3%%man/man3/OCSP_basic_verify.3.gz %%MAN3%%man/man3/OCSP_cert_id_new.3.gz %%MAN3%%man/man3/OCSP_cert_to_id.3.gz %%MAN3%%man/man3/OCSP_check_nonce.3.gz @@ -1365,6 +1406,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/OCSP_single_get0_status.3.gz %%MAN3%%man/man3/OCSP_url_svcloc_new.3.gz %%MAN3%%man/man3/OPENSSL_VERSION_NUMBER.3.gz +%%MAN3%%man/man3/OPENSSL_VERSION_TEXT.3.gz %%MAN3%%man/man3/OPENSSL_cleanse.3.gz %%MAN3%%man/man3/OPENSSL_config.3.gz %%MAN3%%man/man3/OPENSSL_free.3.gz @@ -1648,6 +1690,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/SSL_CIPHER_is_aead.3.gz %%MAN3%%man/man3/SSL_COMP_add_compression_method.3.gz %%MAN3%%man/man3/SSL_COMP_get_compression_methods.3.gz +%%MAN3%%man/man3/SSL_CTX_add1_chain_cert.3.gz %%MAN3%%man/man3/SSL_CTX_add_client_CA.3.gz %%MAN3%%man/man3/SSL_CTX_add_extra_chain_cert.3.gz %%MAN3%%man/man3/SSL_CTX_add_session.3.gz @@ -1815,6 +1858,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/SSL_get0_param.3.gz %%MAN3%%man/man3/SSL_get0_session.3.gz %%MAN3%%man/man3/SSL_get1_session.3.gz +%%MAN3%%man/man3/SSL_get1_supported_ciphers.3.gz %%MAN3%%man/man3/SSL_get_SSL_CTX.3.gz %%MAN3%%man/man3/SSL_get_certificate.3.gz %%MAN3%%man/man3/SSL_get_cipher.3.gz @@ -1824,6 +1868,7 @@ man/man1/openssl.1.gz %%MAN3%%man/man3/SSL_get_cipher_version.3.gz %%MAN3%%man/man3/SSL_get_ciphers.3.gz %%MAN3%%man/man3/SSL_get_client_CA_list.3.gz +%%MAN3%%man/man3/SSL_get_client_ciphers.3.gz %%MAN3%%man/man3/SSL_get_client_random.3.gz %%MAN3%%man/man3/SSL_get_current_cipher.3.gz %%MAN3%%man/man3/SSL_get_default_timeout.3.gz diff --git a/security/nist-kat/Makefile b/security/nist-kat/Makefile index 5cf4fb11d85..be8251417c8 100644 --- a/security/nist-kat/Makefile +++ b/security/nist-kat/Makefile @@ -3,19 +3,23 @@ PORTNAME= nist-kat DISTVERSION= 0.0.2015.02.23 +PORTREVISION= 1 CATEGORIES= security BASE_URL= http://csrc.nist.gov/groups/STM/cavp/documents MASTER_SITES= ${BASE_URL}/aes/:aes MASTER_SITES+= ${BASE_URL}/des/:des MASTER_SITES+= ${BASE_URL}/mac/:mac +MASTER_SITES+= ${BASE_URL}/shs/:shs DISTFILES= KAT_AES.zip:aes DISTFILES+= XTSTestVectors.zip:aes DISTFILES+= KAT_TDES.zip:des +DISTFILES+= ccmtestvectors.zip:mac DISTFILES+= gcmtestvectors.zip:mac DISTFILES+= hmactestvectors.zip:mac +DISTFILES+= shabytetestvectors.zip:shs MAINTAINER= jmg@FreeBSD.org -COMMENT= Collection of NIST's Know Answer Test Vectors +COMMENT= Collection of NIST's Known Answer Test Vectors LICENSE= PD @@ -25,6 +29,11 @@ EXTRACT_AFTER_ARGS= -s ":^:nist-kat/$${file%.zip}/:" NO_BUILD= NO_WRKSUBDIR= +post-extract: + # The SHA test distribution already includes a subdir + (cd ${WRKSRC}/${PORTNAME} && ${MV} shabytetestvectors tmp && \ + ${MV} tmp/shabytetestvectors . && ${RMDIR} tmp) + do-install: ${MKDIR} ${STAGEDIR}${LOCALBASE}/share && \ (cd ${WRKSRC}/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) diff --git a/security/nist-kat/distinfo b/security/nist-kat/distinfo index 556882dc28c..f9305ad38b3 100644 --- a/security/nist-kat/distinfo +++ b/security/nist-kat/distinfo @@ -1,10 +1,15 @@ +TIMESTAMP = 1554766249 SHA256 (KAT_AES.zip) = a203b16c9246b2ebae31dee5de21a606be80cf78ceabaca37150236fa098eb60 SIZE (KAT_AES.zip) = 726299 SHA256 (XTSTestVectors.zip) = 67bb04b018182f65530596786e7783f817d2e56509bf3b1f066609b8e3e29c36 SIZE (XTSTestVectors.zip) = 595731 SHA256 (KAT_TDES.zip) = 640e1df29f0f9e60b756e34870658fc785c706a170e1366eee58f115d3ce3905 SIZE (KAT_TDES.zip) = 115770 +SHA256 (ccmtestvectors.zip) = 0e3c96761bd8f1a0b4dfe666146c32f7d367a49968375ff091b8da9ecaa673aa +SIZE (ccmtestvectors.zip) = 319267 SHA256 (gcmtestvectors.zip) = f9fc479e134cde2980b3bb7cddbcb567b2cd96fd753835243ed067699f26a023 SIZE (gcmtestvectors.zip) = 9154174 SHA256 (hmactestvectors.zip) = 418c3837d38f249d6668146bd0090db24dd3c02d2e6797e3de33860a387ae4bd SIZE (hmactestvectors.zip) = 452025 +SHA256 (shabytetestvectors.zip) = 929ef80b7b3418aca026643f6f248815913b60e01741a44bba9e118067f4c9b8 +SIZE (shabytetestvectors.zip) = 4909729 diff --git a/security/nist-kat/pkg-plist b/security/nist-kat/pkg-plist index efd52bcc9ae..f02790d3ba0 100644 --- a/security/nist-kat/pkg-plist +++ b/security/nist-kat/pkg-plist @@ -130,6 +130,25 @@ %%DATADIR%%/XTSTestVectors/format tweak value input - 128 hex str/XTSGenAES256.rsp %%DATADIR%%/XTSTestVectors/format tweak value input - data unit seq no/XTSGenAES128.rsp %%DATADIR%%/XTSTestVectors/format tweak value input - data unit seq no/XTSGenAES256.rsp +%%DATADIR%%/ccmtestvectors/DVPT128.rsp +%%DATADIR%%/ccmtestvectors/DVPT128.txt +%%DATADIR%%/ccmtestvectors/DVPT192.rsp +%%DATADIR%%/ccmtestvectors/DVPT192.txt +%%DATADIR%%/ccmtestvectors/DVPT256.rsp +%%DATADIR%%/ccmtestvectors/DVPT256.txt +%%DATADIR%%/ccmtestvectors/Readme.txt +%%DATADIR%%/ccmtestvectors/VADT128.rsp +%%DATADIR%%/ccmtestvectors/VADT192.rsp +%%DATADIR%%/ccmtestvectors/VADT256.rsp +%%DATADIR%%/ccmtestvectors/VNT128.rsp +%%DATADIR%%/ccmtestvectors/VNT192.rsp +%%DATADIR%%/ccmtestvectors/VNT256.rsp +%%DATADIR%%/ccmtestvectors/VPT128.rsp +%%DATADIR%%/ccmtestvectors/VPT192.rsp +%%DATADIR%%/ccmtestvectors/VPT256.rsp +%%DATADIR%%/ccmtestvectors/VTT128.rsp +%%DATADIR%%/ccmtestvectors/VTT192.rsp +%%DATADIR%%/ccmtestvectors/VTT256.rsp %%DATADIR%%/gcmtestvectors/gcmDecrypt128.rsp %%DATADIR%%/gcmtestvectors/gcmDecrypt192.rsp %%DATADIR%%/gcmtestvectors/gcmDecrypt256.rsp @@ -137,3 +156,32 @@ %%DATADIR%%/gcmtestvectors/gcmEncryptExtIV192.rsp %%DATADIR%%/gcmtestvectors/gcmEncryptExtIV256.rsp %%DATADIR%%/hmactestvectors/HMAC.rsp +%%DATADIR%%/shabytetestvectors/Readme.txt +%%DATADIR%%/shabytetestvectors/SHA1LongMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA1Monte.rsp +%%DATADIR%%/shabytetestvectors/SHA1Monte.txt +%%DATADIR%%/shabytetestvectors/SHA1ShortMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA224LongMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA224Monte.rsp +%%DATADIR%%/shabytetestvectors/SHA224Monte.txt +%%DATADIR%%/shabytetestvectors/SHA224ShortMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA256LongMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA256Monte.rsp +%%DATADIR%%/shabytetestvectors/SHA256Monte.txt +%%DATADIR%%/shabytetestvectors/SHA256ShortMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA384LongMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA384Monte.rsp +%%DATADIR%%/shabytetestvectors/SHA384Monte.txt +%%DATADIR%%/shabytetestvectors/SHA384ShortMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA512LongMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA512Monte.rsp +%%DATADIR%%/shabytetestvectors/SHA512Monte.txt +%%DATADIR%%/shabytetestvectors/SHA512ShortMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA512_224LongMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA512_224Monte.rsp +%%DATADIR%%/shabytetestvectors/SHA512_224Monte.txt +%%DATADIR%%/shabytetestvectors/SHA512_224ShortMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA512_256LongMsg.rsp +%%DATADIR%%/shabytetestvectors/SHA512_256Monte.rsp +%%DATADIR%%/shabytetestvectors/SHA512_256Monte.txt +%%DATADIR%%/shabytetestvectors/SHA512_256ShortMsg.rsp diff --git a/security/rubygem-rack-oauth212/Makefile b/security/rubygem-rack-oauth212/Makefile deleted file mode 100644 index beba995da85..00000000000 --- a/security/rubygem-rack-oauth212/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $FreeBSD$ - -PORTNAME= rack-oauth2 -PORTVERSION= 1.2.3 -PORTREVISION= 1 -CATEGORIES= security rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 12 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= OAuth 2.0 Server & Client Library - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= rubygem-activesupport50>=2.3:devel/rubygem-activesupport50 \ - rubygem-attr_required>=0.0.5:devel/rubygem-attr_required \ - rubygem-httpclient>=2.4:www/rubygem-httpclient \ - rubygem-multi_json>=1.3.6:devel/rubygem-multi_json \ - rubygem-rack16>=1.1:www/rubygem-rack16 - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -PORTSCOUT= limit:^1\.2\. - -.include diff --git a/security/rubygem-rack-oauth212/distinfo b/security/rubygem-rack-oauth212/distinfo deleted file mode 100644 index 3245f96183e..00000000000 --- a/security/rubygem-rack-oauth212/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1517652248 -SHA256 (rubygem/rack-oauth2-1.2.3.gem) = ced75d7cdc0c5a480f478654d64cabf4d8adae46cdf977c8e3ee4ae5dd80ee48 -SIZE (rubygem/rack-oauth2-1.2.3.gem) = 30208 diff --git a/security/rubygem-rack-oauth212/pkg-descr b/security/rubygem-rack-oauth212/pkg-descr deleted file mode 100644 index 1d071af619e..00000000000 --- a/security/rubygem-rack-oauth212/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -OAuth 2.0 Server & Client Library. -Both Bearer and MAC token type are supported. - -WWW: https://github.com/nov/rack-oauth2 diff --git a/security/sssd/Makefile b/security/sssd/Makefile index e923e16bef7..d4f087b2d3d 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -3,7 +3,7 @@ PORTNAME= sssd PORTVERSION= 1.11.7 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= security MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ @@ -32,7 +32,7 @@ BUILD_DEPENDS= xmlcatalog:textproc/libxml2 \ xsltproc:textproc/libxslt \ xmlcatmgr:textproc/xmlcatmgr \ krb5>=1.10:security/krb5 \ - nsupdate:dns/bind911 + nsupdate:dns/bind-tools GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-selinux=no --with-semanage=no \ diff --git a/sysutils/Makefile b/sysutils/Makefile index 6c1c3321f37..5d87229ed63 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1378,6 +1378,8 @@ SUBDIR += u-boot-nanopi-neo-air SUBDIR += u-boot-olimex-a20-som-evb SUBDIR += u-boot-olinuxino-lime + SUBDIR += u-boot-olinuxino-lime2 + SUBDIR += u-boot-olinuxino-lime2-emmc SUBDIR += u-boot-orangepi-one SUBDIR += u-boot-orangepi-pc SUBDIR += u-boot-orangepi-pc-plus @@ -1411,6 +1413,7 @@ SUBDIR += udfclient SUBDIR += uefi-edk2-bhyve SUBDIR += uefi-edk2-bhyve-csm + SUBDIR += uefi-edk2-bhyve-devel SUBDIR += ufs_copy SUBDIR += uhidd SUBDIR += uif2iso diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index 6189169c379..fa0491d41a2 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= facter -PORTVERSION= 3.13.1 +PORTVERSION= 3.13.2 PORTREVISION= 1 CATEGORIES?= sysutils MASTER_SITES= https://downloads.puppetlabs.com/facter/ diff --git a/sysutils/facter/distinfo b/sysutils/facter/distinfo index 5608f05e8fc..70d72c23741 100644 --- a/sysutils/facter/distinfo +++ b/sysutils/facter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554308427 -SHA256 (facter-3.13.1.tar.gz) = c4556d856033f901cb8d7eabadf5fab8dbddc88959713536a470964682e22f51 -SIZE (facter-3.13.1.tar.gz) = 351282 +TIMESTAMP = 1555524064 +SHA256 (facter-3.13.2.tar.gz) = 69fe3c64877ff1077f5512c904b98b75a3f5631ac84e274382e3a232ff609f68 +SIZE (facter-3.13.2.tar.gz) = 351298 diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile index db3b912d0c4..44059d76a55 100644 --- a/sysutils/fusefs-rar2fs/Makefile +++ b/sysutils/fusefs-rar2fs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rar2fs -PORTVERSION= 1.27.1 +PORTVERSION= 1.27.2 DISTVERSIONPREFIX= v CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- diff --git a/sysutils/fusefs-rar2fs/distinfo b/sysutils/fusefs-rar2fs/distinfo index f7f0eefd056..a80c31ddfdd 100644 --- a/sysutils/fusefs-rar2fs/distinfo +++ b/sysutils/fusefs-rar2fs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550931584 -SHA256 (hasse69-rar2fs-v1.27.1_GH0.tar.gz) = 69a19b27555319723bea5088cf2c00ec5aa641ff50a148ac04629c0bfe42d9f6 -SIZE (hasse69-rar2fs-v1.27.1_GH0.tar.gz) = 133091 +TIMESTAMP = 1552886585 +SHA256 (hasse69-rar2fs-v1.27.2_GH0.tar.gz) = d05c370ab3c00ef568938294e640d6bfb613ad07a43fdc46a27c8d39d291810d +SIZE (hasse69-rar2fs-v1.27.2_GH0.tar.gz) = 132877 diff --git a/sysutils/puppet5/Makefile b/sysutils/puppet5/Makefile index 55bf2f8ce24..08eec4b3dc0 100644 --- a/sysutils/puppet5/Makefile +++ b/sysutils/puppet5/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 5.5.12 +PORTVERSION= 5.5.13 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 5 diff --git a/sysutils/puppet5/distinfo b/sysutils/puppet5/distinfo index 56d6d8e41f5..424bfff54d6 100644 --- a/sysutils/puppet5/distinfo +++ b/sysutils/puppet5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554308258 -SHA256 (puppet-5.5.12.tar.gz) = 17dc9b5c918053af172d40db7357153e28938e1084e4618c315dc784b5f8900a -SIZE (puppet-5.5.12.tar.gz) = 3073481 +TIMESTAMP = 1556071277 +SHA256 (puppet-5.5.13.tar.gz) = 0e903ad59540e00a9321152707ec22a561e3004c1bad815ef403204be1b27c6d +SIZE (puppet-5.5.13.tar.gz) = 3076054 diff --git a/sysutils/puppet5/files/patch-lib_puppet_provider_package_gem.rb b/sysutils/puppet5/files/patch-lib_puppet_provider_package_gem.rb new file mode 100644 index 00000000000..71b2ea076d9 --- /dev/null +++ b/sysutils/puppet5/files/patch-lib_puppet_provider_package_gem.rb @@ -0,0 +1,11 @@ +--- lib/puppet/provider/package/gem.rb.orig ++++ lib/puppet/provider/package/gem.rb +@@ -128,7 +128,7 @@ + end + end + else +- command << "--no-rdoc" << "--no-ri" << resource[:name] ++ command << "--no-document" << resource[:name] + end + + output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}) diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile index ec929a49b81..b0ffa5ee05c 100644 --- a/sysutils/puppet6/Makefile +++ b/sysutils/puppet6/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 6.4.0 +PORTVERSION= 6.4.1 +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMESUFFIX= 6 diff --git a/sysutils/puppet6/distinfo b/sysutils/puppet6/distinfo index 86cf4faeeba..c0717d441f7 100644 --- a/sysutils/puppet6/distinfo +++ b/sysutils/puppet6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554308231 -SHA256 (puppetlabs-puppet-6.4.0_GH0.tar.gz) = 76e60240814fcbecacdf2072b6f21e16a7fb57ad7a5627de585e74f866b44d0f -SIZE (puppetlabs-puppet-6.4.0_GH0.tar.gz) = 3243148 +TIMESTAMP = 1555091624 +SHA256 (puppetlabs-puppet-6.4.1_GH0.tar.gz) = a6aaceae172bf38de16d146588adb8cd09a98fa5dbd3c9bfb99aaeb129a09c4b +SIZE (puppetlabs-puppet-6.4.1_GH0.tar.gz) = 3245818 diff --git a/sysutils/puppet6/files/patch-.gemspec b/sysutils/puppet6/files/patch-.gemspec new file mode 100644 index 00000000000..4a6fb02cf2d --- /dev/null +++ b/sysutils/puppet6/files/patch-.gemspec @@ -0,0 +1,11 @@ +--- .gemspec.orig ++++ .gemspec +@@ -34,7 +34,7 @@ + s.add_runtime_dependency(%q, [">= 2.4.0", "< 4"]) + s.add_runtime_dependency(%q, [">= 3.2.1", "< 4"]) + s.add_runtime_dependency(%q, "~> 1.0") +- s.add_runtime_dependency(%q, "~> 1.1.2") ++ s.add_runtime_dependency(%q, "~> 1.1") + s.add_runtime_dependency(%q, "~> 2.1") + s.add_runtime_dependency(%q, "~> 1.13") + s.add_runtime_dependency(%q, "~> 2.8") diff --git a/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb b/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb new file mode 100644 index 00000000000..2a14928de53 --- /dev/null +++ b/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb @@ -0,0 +1,11 @@ +--- lib/puppet/provider/package/gem.rb.orig 2019-04-09 12:24:52 UTC ++++ lib/puppet/provider/package/gem.rb +@@ -128,7 +128,7 @@ Puppet::Type.type(:package).provide :gem, :parent => P + end + end + else +- command << "--no-rdoc" << "--no-ri" << resource[:name] ++ command << "--no-document" << resource[:name] + end + + output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}) diff --git a/sysutils/py-ansible-runner/Makefile b/sysutils/py-ansible-runner/Makefile index d7234af1250..91ec919ba06 100644 --- a/sysutils/py-ansible-runner/Makefile +++ b/sysutils/py-ansible-runner/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ansible-runner -DISTVERSION= 1.1.2 -PORTREVISION= 1 +DISTVERSION= 1.3.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-ansible-runner/distinfo b/sysutils/py-ansible-runner/distinfo index d3b07fe7b81..f9fdb41f421 100644 --- a/sysutils/py-ansible-runner/distinfo +++ b/sysutils/py-ansible-runner/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540338423 -SHA256 (ansible-runner-1.1.2.tar.gz) = 2376b39c7b4749e17e15a21844e37164d6df964c9f35f27aa679c0707b1f7b19 -SIZE (ansible-runner-1.1.2.tar.gz) = 675734 +TIMESTAMP = 1556007124 +SHA256 (ansible-runner-1.3.3.tar.gz) = 2a2b83e63b830de3ff01c2992342cfe09f96e410953c85904ee7e301b21fa513 +SIZE (ansible-runner-1.3.3.tar.gz) = 40400 diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile index 08440e946b0..57c29756065 100644 --- a/sysutils/py-google-compute-engine/Makefile +++ b/sysutils/py-google-compute-engine/Makefile @@ -2,7 +2,7 @@ PORTNAME= google-compute-engine DISTVERSION= 2.8.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,16 +18,23 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ google_oslogin_control:sysutils/google-compute-engine-oslogin \ sudo:security/sudo +.if ${FLAVOR:Upy36:Mpy3*} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} +.endif + USES= python shebangfix USE_PYTHON= autoplist concurrent distutils +WRKSRC_SUBDIR= packages/python-google-compute-engine + NO_ARCH= yes -SHEBANG_FILES= scripts/google_set_multiqueue scripts/google_optimize_local_ssd +SHEBANG_FILES= ../google-compute-engine/src/usr/bin/google_set_multiqueue \ + ../google-compute-engine/src/usr/bin/google_optimize_local_ssd USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages -GH_TAGNAME= 20190124 +GH_TAGNAME= 20190416 USE_RC_SUBR= google_instance_setup \ google_accounts_daemon \ diff --git a/sysutils/py-google-compute-engine/distinfo b/sysutils/py-google-compute-engine/distinfo index 353b734b4ae..0e754c97b24 100644 --- a/sysutils/py-google-compute-engine/distinfo +++ b/sysutils/py-google-compute-engine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551668922 -SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.13-20190124_GH0.tar.gz) = 09637f951245729c66eb5b7b9ed49bead31349b29829baf5c8a4e5d45405a2f4 -SIZE (GoogleCloudPlatform-compute-image-packages-2.8.13-20190124_GH0.tar.gz) = 126211 +TIMESTAMP = 1556025006 +SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.13-20190416_GH0.tar.gz) = cef65af726b7c32db9035266804e0393b54196fabd1007026554bae2d9540de4 +SIZE (GoogleCloudPlatform-compute-image-packages-2.8.13-20190416_GH0.tar.gz) = 130216 diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile index ace9b962d8d..6064936861c 100644 --- a/sysutils/rubygem-r10k/Makefile +++ b/sysutils/rubygem-r10k/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= r10k -PORTVERSION= 3.1.1 +PORTVERSION= 3.2.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-r10k/distinfo b/sysutils/rubygem-r10k/distinfo index 46f0101a51d..811bd2b63f5 100644 --- a/sysutils/rubygem-r10k/distinfo +++ b/sysutils/rubygem-r10k/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551504807 -SHA256 (rubygem/r10k-3.1.1.gem) = e2465753c5d2a781b649d5ea110a100fe6bad67d11c8116bda0b023bc7ee4f34 -SIZE (rubygem/r10k-3.1.1.gem) = 203776 +TIMESTAMP = 1555524600 +SHA256 (rubygem/r10k-3.2.0.gem) = 7296c8062ee2d9f3cd2840f2b8a5f64c98a9dbd70ac265de931cf4dd369d5b7a +SIZE (rubygem/r10k-3.2.0.gem) = 206336 diff --git a/sysutils/u-boot-olinuxino-lime2-emmc/Makefile b/sysutils/u-boot-olinuxino-lime2-emmc/Makefile new file mode 100644 index 00000000000..0cf57d5a305 --- /dev/null +++ b/sysutils/u-boot-olinuxino-lime2-emmc/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../u-boot-master + +MODEL= olinuxino-lime2-emmc +BOARD_CONFIG= A20-OLinuXino-Lime2-eMMC_defconfig +FAMILY= allwinner + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/u-boot-olinuxino-lime2-emmc/pkg-descr b/sysutils/u-boot-olinuxino-lime2-emmc/pkg-descr new file mode 100644 index 00000000000..270fa649df3 --- /dev/null +++ b/sysutils/u-boot-olinuxino-lime2-emmc/pkg-descr @@ -0,0 +1,13 @@ +U-Boot loader for Olinuxino Lime2. + +To install this bootloader on an sdcard just do : +dd if=$LOCALBASE/share/u-boot/u-boot-olinuxino-lime/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync + +This version is patched so that: + * API features are enabled. + * A boot.scr (U-Boot script) that loads ubldr.bin and execute it is included + +For information about running FreeBSD on Allwinner boards, see +https://wiki.freebsd.org/FreeBSD/arm/Allwinner + +WWW: http://www.denx.de/wiki/U-Boot diff --git a/sysutils/u-boot-olinuxino-lime2/Makefile b/sysutils/u-boot-olinuxino-lime2/Makefile new file mode 100644 index 00000000000..1e27b5d8571 --- /dev/null +++ b/sysutils/u-boot-olinuxino-lime2/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../u-boot-master + +MODEL= olinuxino-lime2 +BOARD_CONFIG= A20-OLinuXino-Lime2_defconfig +FAMILY= allwinner + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/u-boot-olinuxino-lime2/pkg-descr b/sysutils/u-boot-olinuxino-lime2/pkg-descr new file mode 100644 index 00000000000..270fa649df3 --- /dev/null +++ b/sysutils/u-boot-olinuxino-lime2/pkg-descr @@ -0,0 +1,13 @@ +U-Boot loader for Olinuxino Lime2. + +To install this bootloader on an sdcard just do : +dd if=$LOCALBASE/share/u-boot/u-boot-olinuxino-lime/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync + +This version is patched so that: + * API features are enabled. + * A boot.scr (U-Boot script) that loads ubldr.bin and execute it is included + +For information about running FreeBSD on Allwinner boards, see +https://wiki.freebsd.org/FreeBSD/arm/Allwinner + +WWW: http://www.denx.de/wiki/U-Boot diff --git a/sysutils/uefi-edk2-bhyve-devel/Makefile b/sysutils/uefi-edk2-bhyve-devel/Makefile new file mode 100644 index 00000000000..e27de64f945 --- /dev/null +++ b/sysutils/uefi-edk2-bhyve-devel/Makefile @@ -0,0 +1,79 @@ +# $FreeBSD$ + +PORTNAME= uefi-edk2-bhyve-devel +DISTVERSION= g20190424 +CATEGORIES= sysutils + +MAINTAINER= araujo@FreeBSD.org +COMMENT= UEFI-EDK2 firmware for bhyve + +LICENSE= BSD2CLAUSE + +ONLY_FOR_ARCHS= amd64 + +BUILD_DEPENDS= ${BASH_CMD}:shells/bash \ + nasm:devel/nasm \ + ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} + +USES= gmake \ + python:2.7,build +USE_GCC= 8+ +USE_GITHUB= yes +GH_ACCOUNT= freebsd +GH_PROJECT= uefi-edk2 +GH_TAGNAME= 0613ec3 +GH_TUPLE= openssl:openssl:OpenSSL_1_1_0j:openssl/src/github.com/openssl/openssl + +PLIST_FILES= share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}-devel.fd \ + share/uefi-firmware/BHYVE_UEFI_VARS${PLIST_SUFFIX}-devel.fd + +OPTIONS_DEFINE= DEBUG HTTP_BOOT +OPTIONS_DEFAULT= HTTP_BOOT + +DEBUG_DESC= Build a debug configuration +HTTP_BOOT_DESC= Build with HTTP(S) boot support + +DEBUG_VARS= uefi_target=DEBUG +DEBUG_VARS_OFF= uefi_target=RELEASE +HTTP_BOOT_VARS= build_args+=-DHTTP_BOOT_ENABLE=TRUE + +BASH_CMD= ${LOCALBASE}/bin/bash + +MAKE_ARGS+= EXTRA_LDFLAGS=-static +MAKE_ARGS+= SHELL=${BASH_CMD} +MAKE_ENV+= PYTHON_COMMAND=${PYTHON_CMD} +BUILD_ARGS= -DDEBUG_ON_SERIAL_PORT=TRUE + +post-extract: + @${RMDIR} ${WRKSRC}/CryptoPkg/Library/OpensslLib/openssl + @${MV} ${WRKSRC}/src/github.com/openssl/openssl \ + ${WRKSRC}/CryptoPkg/Library/OpensslLib/openssl +do-build: + ${MKDIR} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}; + ${LN} -sf ${LOCALBASE}/bin/gcc${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc + ${LN} -sf ${LOCALBASE}/bin/gcc${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/cc + ${LN} -sf ${LOCALBASE}/bin/g++${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/g++ + ${LN} -sf ${LOCALBASE}/bin/ld ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/ld + ${LN} -sf ${LOCALBASE}/bin/gmake ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/make + ${LN} -sf ${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc-ar + ${LN} -sf ${LOCALBASE}/bin/gcc-nm${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc-nm + ${LN} -sf ${LOCALBASE}/bin/objcopy ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/objcopy + ${LN} -sf ${LOCALBASE}/bin/nasm ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/nasm + unset ARCH; unset MAKEFLAGS + ${SETENV} ${MAKE_ENV} ${BASH_CMD} -c "cd ${WRKSRC}; . ./edksetup.sh; ${MAKE_CMD} ${MAKE_ARGS} -C ${WRKSRC}/BaseTools" + ${SETENV} ${MAKE_ENV} ${BASH_CMD} -c " \ + cd ${BUILD_WRKSRC}; \ + unset ARCH; unset MAKEFLAGS; \ + . ./edksetup.sh; \ + build -t GCC5 -a X64 -b ${UEFI_TARGET} -p OvmfPkg/OvmfPkgX64.dsc ${BUILD_ARGS} \ + " + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-firmware/ + ${INSTALL} ${BUILD_WRKSRC}/Build/OvmfX64/${UEFI_TARGET}_GCC5/FV/OVMF_CODE.fd \ + ${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}-devel.fd + ${INSTALL} ${BUILD_WRKSRC}/Build/OvmfX64/${UEFI_TARGET}_GCC5/FV/OVMF_VARS.fd \ + ${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI_VARS${PLIST_SUFFIX}-devel.fd + +.include +RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} diff --git a/sysutils/uefi-edk2-bhyve-devel/distinfo b/sysutils/uefi-edk2-bhyve-devel/distinfo new file mode 100644 index 00000000000..9dcc0575a3e --- /dev/null +++ b/sysutils/uefi-edk2-bhyve-devel/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1556115530 +SHA256 (freebsd-uefi-edk2-g20190424-0613ec3_GH0.tar.gz) = fbdb9bedfcb2a05981e94027a2f29d1d16e89d923daad72e9437723ec9d1cbc0 +SIZE (freebsd-uefi-edk2-g20190424-0613ec3_GH0.tar.gz) = 34125617 +SHA256 (openssl-openssl-OpenSSL_1_1_0j_GH0.tar.gz) = 95f9d879e66f76711db28d8c2f24ab4e049ab7d5afb7266238a312c95bb9f338 +SIZE (openssl-openssl-OpenSSL_1_1_0j_GH0.tar.gz) = 5949610 diff --git a/sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c b/sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c new file mode 100644 index 00000000000..9a0a2e58fcb --- /dev/null +++ b/sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c @@ -0,0 +1,11 @@ +--- CryptoPkg/Library/OpensslLib/openssl/crypto/uid.c.orig 2019-03-20 05:39:21 UTC ++++ CryptoPkg/Library/OpensslLib/openssl/crypto/uid.c +@@ -14,6 +14,8 @@ + + # include OPENSSL_UNISTD + ++int issetugid(void); ++ + int OPENSSL_issetugid(void) + { + return issetugid(); diff --git a/sysutils/uefi-edk2-bhyve-devel/pkg-descr b/sysutils/uefi-edk2-bhyve-devel/pkg-descr new file mode 100644 index 00000000000..520eed1e42d --- /dev/null +++ b/sysutils/uefi-edk2-bhyve-devel/pkg-descr @@ -0,0 +1,3 @@ +UEFI-EDK2 firmware for bhyve. + +WWW: https://github.com/freebsd/uefi-edk2/tree/bhyve/edk2-stable201903 diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 84805221d7c..1047640bf39 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -2,8 +2,8 @@ PORTNAME= xen PKGNAMESUFFIX= -tools -PORTVERSION= 4.11.1 -PORTREVISION= 2 +PORTVERSION= 4.12.0 +PORTREVISION= 0 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -41,20 +41,10 @@ HAS_CONFIGURE= yes # Set ARCH=x86_64 in order to overwrite the environment ARCH=amd64 MAKE_ARGS= clang=y ARCH=x86_64 -# Set correct include paths taking /usr/local into account. -EXTRA_PATCHES= ${FILESDIR}/0001-build-fix-include-paths-in-FreeBSD.patch:-p1 -# Build with lld (LLVM linker) -EXTRA_PATCHES+= ${FILESDIR}/0001-x86-replace-usage-in-the-linker-script.patch:-p1 -# Fix docs build -EXTRA_PATCHES+= ${FILESDIR}/0001-docs-use-the-make-wildcard-function-instead-of-find.patch:-p1 -# Fix hvmloader build with LLVM LD -EXTRA_PATCHES+= ${FILESDIR}/0001-hvmloader-fix-build-with-LLVM-Linker.patch:-p1 - CONFIGURE_ARGS+= --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin \ --mandir=${MANPREFIX}/man -SHEBANG_FILES= tools/misc/xen-ringwatch \ - tools/misc/xencov_split \ +SHEBANG_FILES= tools/misc/xencov_split \ tools/python/scripts/convert-legacy-stream \ tools/python/scripts/verify-stream-v2 \ tools/xenmon/xenmon.py @@ -64,6 +54,8 @@ DOCS_ALL_TARGET= docs INSTALL_TARGET= install-tools DOCS_INSTALL_TARGET= install-docs +EXTRA_PATCHES+= ${FILESDIR}/0001-tools-include-propagate-python-interpreter-path.patch:-p1 + .include .if ${OPSYS} != FreeBSD diff --git a/sysutils/xen-tools/distinfo b/sysutils/xen-tools/distinfo index a61ead1394a..85ee9e3c004 100644 --- a/sysutils/xen-tools/distinfo +++ b/sysutils/xen-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550823720 -SHA256 (xen-4.11.1.tar.gz) = be88cb2443761990efc1070d9718016561fe19066af232f9bfae572922897e59 -SIZE (xen-4.11.1.tar.gz) = 25152217 +TIMESTAMP = 1555345627 +SHA256 (xen-4.12.0.tar.gz) = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64 +SIZE (xen-4.12.0.tar.gz) = 26949697 diff --git a/sysutils/xen-tools/files/0001-build-fix-include-paths-in-FreeBSD.patch b/sysutils/xen-tools/files/0001-build-fix-include-paths-in-FreeBSD.patch deleted file mode 100644 index 576914612cb..00000000000 --- a/sysutils/xen-tools/files/0001-build-fix-include-paths-in-FreeBSD.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fe9b60476a548de1c62d6fc985e9741b04479d36 Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Mon, 2 Jul 2018 10:28:26 +0200 -Subject: [PATCH] build: fix include paths in FreeBSD -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -FreeBSD package manager uses /usr/local/ as the default install path, -but that's not part of the compiler search path, so add it using the -APPEND_{LIB/INCLUDES} variables. - -Signed-off-by: Roger Pau Monné -Acked-by: Wei Liu ---- - config/FreeBSD.mk | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk -index afeaefbde2..98a5117e60 100644 ---- a/config/FreeBSD.mk -+++ b/config/FreeBSD.mk -@@ -3,3 +3,7 @@ include $(XEN_ROOT)/config/StdGNU.mk - # No wget on FreeBSD base system - WGET = ftp - PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig -+ -+# Add the default pkg install path -+APPEND_LIB += /usr/local/lib -+APPEND_INCLUDES += /usr/local/include --- -2.18.0 - diff --git a/sysutils/xen-tools/files/0001-docs-use-the-make-wildcard-function-instead-of-find.patch b/sysutils/xen-tools/files/0001-docs-use-the-make-wildcard-function-instead-of-find.patch deleted file mode 100644 index 72c6d8bb2ac..00000000000 --- a/sysutils/xen-tools/files/0001-docs-use-the-make-wildcard-function-instead-of-find.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 76c9776e63305c23bca03eba933e7ce2ecbb749c Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Mon, 23 Jul 2018 17:58:35 +0200 -Subject: [PATCH] docs: use the make wildcard function instead of find -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The regexp used with find in order to list the man pages doesn't work -with FreeBSD find, so use a wildcard instead. No functional change. - -Signed-off-by: Roger Pau Monné ---- -Cc: Ian Jackson -Cc: Wei Liu ---- - docs/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/docs/Makefile b/docs/Makefile -index b300bb6be1..fba6673db6 100644 ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -8,10 +8,10 @@ DATE := $(shell date +%Y-%m-%d) - DOC_ARCHES := arm x86_32 x86_64 - - # Documentation sources to build --MAN1SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.1' -print)) --MAN5SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.5' -print)) --MAN7SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.7' -print)) --MAN8SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.8' -print)) -+MAN1SRC-y := $(sort $(wildcard man/*.pod.1 man/*.markdown.1)) -+MAN5SRC-y := $(sort $(wildcard man/*.pod.5 man/*.markdown.5)) -+MAN7SRC-y := $(sort $(wildcard man/*.pod.7 man/*.markdown.7)) -+MAN8SRC-y := $(sort $(wildcard man/*.pod.8 man/*.markdown.8)) - - MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) - --- -2.18.0 - diff --git a/sysutils/xen-tools/files/0001-hvmloader-fix-build-with-LLVM-Linker.patch b/sysutils/xen-tools/files/0001-hvmloader-fix-build-with-LLVM-Linker.patch deleted file mode 100644 index 09245d6104e..00000000000 --- a/sysutils/xen-tools/files/0001-hvmloader-fix-build-with-LLVM-Linker.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 9aa8c031ce844ada6832a56d3b25341bed2825db Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Fri, 24 Aug 2018 10:14:28 +0200 -Subject: [PATCH] hvmloader: fix build with LLVM Linker -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The hvmloader binary generated when using LLVM LD doesn't work -properly and seems to get stuck while trying to generate and load the -ACPI tables. This is caused by the layout of the binary when linked -with LLVM LD. - -LLVM LD has a different default linker script that GNU LD, and the -resulting hvmloader binary is slightly different: - -LLVM LD: -Program Headers: - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - PHDR 0x000034 0x000ff034 0x000ff034 0x00060 0x00060 R 0x4 - LOAD 0x000000 0x000ff000 0x000ff000 0x38000 0x38000 RWE 0x1000 - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0 - -GNU LD: -Program Headers: - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - LOAD 0x000080 0x00100000 0x00100000 0x36308 0x3fd74 RWE 0x10 - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x4 - -Note that in the LLVM LD case (as with GNU LD) the .text section does -indeed have the address set to 0x100000 as requested on the command -line: - -[ 1] .text PROGBITS 00100000 001000 00dd10 00 AX 0 0 16 - -There's however the PHDR which is not present when using GNU LD. - -Fix this by using a very simple linker script that generates the same -binary regardless of whether LLVM or GNU LD is used. By using a linker -script the usage of -Ttext can also be avoided by placing the desired -.text load address directly in the linker script. - -Signed-off-by: Roger Pau Monné ---- -Jan Beulich -Andrew Cooper -Wei Liu -Ian Jackson ---- - tools/firmware/hvmloader/Makefile | 7 ++----- - tools/firmware/hvmloader/hvmloader.lds | 13 +++++++++++++ - 2 files changed, 15 insertions(+), 5 deletions(-) - create mode 100644 tools/firmware/hvmloader/hvmloader.lds - -diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile -index 496ac72b77..e980ce7c5f 100644 ---- a/tools/firmware/hvmloader/Makefile -+++ b/tools/firmware/hvmloader/Makefile -@@ -20,9 +20,6 @@ - XEN_ROOT = $(CURDIR)/../../.. - include $(XEN_ROOT)/tools/firmware/Rules.mk - -- --LOADADDR = 0x100000 -- - # SMBIOS spec requires format mm/dd/yyyy - SMBIOS_REL_DATE ?= $(shell date +%m/%d/%Y) - -@@ -82,8 +79,8 @@ vpath build.c $(ACPI_PATH) - vpath static_tables.c $(ACPI_PATH) - OBJS += $(ACPI_OBJS) - --hvmloader: $(OBJS) -- $(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o $@ $^ -+hvmloader: $(OBJS) hvmloader.lds -+ $(LD) $(LDFLAGS_DIRECT) -N -T hvmloader.lds -o $@ $(OBJS) - - roms.inc: $(ROMS) - echo "/* Autogenerated file. DO NOT EDIT */" > $@.new -diff --git a/tools/firmware/hvmloader/hvmloader.lds b/tools/firmware/hvmloader/hvmloader.lds -new file mode 100644 -index 0000000000..15d8f38fff ---- /dev/null -+++ b/tools/firmware/hvmloader/hvmloader.lds -@@ -0,0 +1,13 @@ -+SECTIONS -+{ -+ . = 0x100000; -+ /* -+ * NB: there's no need to use the AT keyword in order to set the LMA, by -+ * default the linker will use VMA = LMA unless specified otherwise. -+ */ -+ .text : { *(.text) } -+ .rodata : { *(.rodata) } -+ .data : { *(.data) } -+ .bss : { *(.bss) } -+ _end = .; -+} --- -2.18.0 - diff --git a/sysutils/xen-tools/files/0001-tools-include-propagate-python-interpreter-path.patch b/sysutils/xen-tools/files/0001-tools-include-propagate-python-interpreter-path.patch new file mode 100644 index 00000000000..31356e27083 --- /dev/null +++ b/sysutils/xen-tools/files/0001-tools-include-propagate-python-interpreter-path.patch @@ -0,0 +1,33 @@ +From 6b9481a710c2158ba47fbc18a0767f643cfdfee1 Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne +Date: Thu, 18 Apr 2019 11:35:00 +0200 +Subject: [PATCH] tools/include: propagate python interpreter path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To the Makefile that generates the cpuid policy. Without this fix if +the tools python interpreter is different than the default 'python' it +won't be correctly propagated. + +Signed-off-by: Roger Pau Monné +--- + tools/include/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/include/Makefile b/tools/include/Makefile +index d693810053..71538e1ce2 100644 +--- a/tools/include/Makefile ++++ b/tools/include/Makefile +@@ -32,7 +32,7 @@ endif + touch $@ + + all-$(CONFIG_X86): xen/.dir +- $(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT) ++ $(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT) PYTHON=$(PYTHON) + + # Not xen/xsm as that clashes with link to + # $(XEN_ROOT)/xen/include/public/xsm above. +-- +2.17.2 (Apple Git-113) + diff --git a/sysutils/xen-tools/files/0001-x86-replace-usage-in-the-linker-script.patch b/sysutils/xen-tools/files/0001-x86-replace-usage-in-the-linker-script.patch deleted file mode 100644 index 4b1f808d9a7..00000000000 --- a/sysutils/xen-tools/files/0001-x86-replace-usage-in-the-linker-script.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e21ba44f771226a5f6f0ce269aabcfb019eae539 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= -Date: Thu, 12 Jul 2018 10:48:18 +0200 -Subject: [PATCH] x86: replace '||' usage in the linker script -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With '|'. The result is the same, and the later works with lld. Fixes -the following error when building Xen with lld: - -ld -melf_x86_64_fbsd -T xen.lds -N prelink.o --build-id=sha1 \ - /root/src/xen/xen/common/symbols-dummy.o -o /root/src/xen/xen/.xen-syms.0 -ld: error: xen.lds:260: malformed number: | ->>> ASSERT(__image_base__ > (((((((((261 >> 8) * 0xffff000000000000) | (261 << 39))) + ((1 << 39) / 2)) + (64 << 30)) + (1 << 30)) + (1 << 30))) || ->>> ^ - -Signed-off-by: Roger Pau Monné -Reviewed-by: Jan Beulich ---- - xen/arch/x86/xen.lds.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S -index 70afedd31d..326e885402 100644 ---- a/xen/arch/x86/xen.lds.S -+++ b/xen/arch/x86/xen.lds.S -@@ -331,7 +331,7 @@ SECTIONS - .comment 0 : { *(.comment) } - } - --ASSERT(__image_base__ > XEN_VIRT_START || -+ASSERT(__image_base__ > XEN_VIRT_START | - __2M_rwdata_end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE, - "Xen image overlaps stubs area") - --- -2.18.0 - diff --git a/sysutils/xen-tools/pkg-plist b/sysutils/xen-tools/pkg-plist index 2fbbc9714d4..751a237b522 100644 --- a/sysutils/xen-tools/pkg-plist +++ b/sysutils/xen-tools/pkg-plist @@ -30,9 +30,6 @@ etc/rc.d/xendriverdomain include/_libxl_list.h include/_libxl_types.h include/_libxl_types_json.h -include/fsimage.h -include/fsimage_grub.h -include/fsimage_plugin.h include/libxl.h include/libxl_event.h include/libxl_json.h @@ -53,7 +50,9 @@ include/xen/arch-x86/xen-x86_64.h include/xen/arch-x86/xen.h include/xen/arch-x86_32.h include/xen/arch-x86_64.h +include/xen/argo.h include/xen/callback.h +include/xen/device_tree_defs.h include/xen/dom0_ops.h include/xen/domctl.h include/xen/elfnote.h @@ -121,6 +120,9 @@ include/xenctrl_compat.h include/xendevicemodel.h include/xenevtchn.h include/xenforeignmemory.h +include/xenfsimage.h +include/xenfsimage_grub.h +include/xenfsimage_plugin.h include/xengnttab.h include/xenguest.h include/xenstat.h @@ -133,28 +135,18 @@ include/xentoollog.h include/xs.h include/xs_lib.h lib/debug/usr/local/lib/xen/boot/xen-shim-syms -lib/fs/ext2fs/fsimage.so -lib/fs/fat/fsimage.so -lib/fs/iso9660/fsimage.so -lib/fs/reiserfs/fsimage.so -lib/fs/ufs/fsimage.so -lib/fs/xfs/fsimage.so -lib/fs/zfs/fsimage.so -lib/libfsimage.so -lib/libfsimage.so.1.0 -lib/libfsimage.so.1.0.0 lib/libxencall.a lib/libxencall.so lib/libxencall.so.1 -lib/libxencall.so.1.1 +lib/libxencall.so.1.2 lib/libxenctrl.a lib/libxenctrl.so -lib/libxenctrl.so.4.11 -lib/libxenctrl.so.4.11.0 +lib/libxenctrl.so.4.12 +lib/libxenctrl.so.4.12.0 lib/libxendevicemodel.a lib/libxendevicemodel.so lib/libxendevicemodel.so.1 -lib/libxendevicemodel.so.1.2 +lib/libxendevicemodel.so.1.3 lib/libxenevtchn.a lib/libxenevtchn.so lib/libxenevtchn.so.1 @@ -163,22 +155,25 @@ lib/libxenforeignmemory.a lib/libxenforeignmemory.so lib/libxenforeignmemory.so.1 lib/libxenforeignmemory.so.1.3 +lib/libxenfsimage.so +lib/libxenfsimage.so.4.12 +lib/libxenfsimage.so.4.12.0 lib/libxengnttab.a lib/libxengnttab.so lib/libxengnttab.so.1 -lib/libxengnttab.so.1.1 +lib/libxengnttab.so.1.2 lib/libxenguest.a lib/libxenguest.so -lib/libxenguest.so.4.11 -lib/libxenguest.so.4.11.0 +lib/libxenguest.so.4.12 +lib/libxenguest.so.4.12.0 lib/libxenlight.a lib/libxenlight.so -lib/libxenlight.so.4.11 -lib/libxenlight.so.4.11.0 +lib/libxenlight.so.4.12 +lib/libxenlight.so.4.12.0 lib/libxenstat.a lib/libxenstat.so -lib/libxenstat.so.0 -lib/libxenstat.so.0.0 +lib/libxenstat.so.4.12 +lib/libxenstat.so.4.12.0 lib/libxenstore.a lib/libxenstore.so lib/libxenstore.so.3.0 @@ -193,9 +188,8 @@ lib/libxentoollog.so.1 lib/libxentoollog.so.1.0 lib/libxlutil.a lib/libxlutil.so -lib/libxlutil.so.4.11 -lib/libxlutil.so.4.11.0 -%%PYTHON_SITELIBDIR%%/fsimage.so +lib/libxlutil.so.4.12 +lib/libxlutil.so.4.12.0 %%PYTHON_SITELIBDIR%%/grub/ExtLinuxConf.py %%PYTHON_SITELIBDIR%%/grub/ExtLinuxConf.pyc %%PYTHON_SITELIBDIR%%/grub/GrubConf.py @@ -204,7 +198,7 @@ lib/libxlutil.so.4.11.0 %%PYTHON_SITELIBDIR%%/grub/LiloConf.pyc %%PYTHON_SITELIBDIR%%/grub/__init__.py %%PYTHON_SITELIBDIR%%/grub/__init__.pyc -%%PYTHON_SITELIBDIR%%/pygrub-0.3-py%%PYTHON_VER%%.egg-info +%%PYTHON_SITELIBDIR%%/pygrub-0.6-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/xen-3.0-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/xen/__init__.py %%PYTHON_SITELIBDIR%%/xen/__init__.pyc @@ -228,7 +222,9 @@ lib/libxlutil.so.4.11.0 %%PYTHON_SITELIBDIR%%/xen/migration/verify.pyc %%PYTHON_SITELIBDIR%%/xen/migration/xl.py %%PYTHON_SITELIBDIR%%/xen/migration/xl.pyc +%%PYTHON_SITELIBDIR%%/xenfsimage.so lib/xen/bin/convert-legacy-stream +lib/xen/bin/depriv-fd-checker lib/xen/bin/libxl-save-helper lib/xen/bin/lsevtchn lib/xen/bin/pygrub @@ -245,6 +241,13 @@ lib/xen/bin/xenpaging lib/xen/bin/xenpvnetboot lib/xen/boot/hvmloader lib/xen/boot/xen-shim +lib/xenfsimage/ext2fs/fsimage.so +lib/xenfsimage/fat/fsimage.so +lib/xenfsimage/iso9660/fsimage.so +lib/xenfsimage/reiserfs/fsimage.so +lib/xenfsimage/ufs/fsimage.so +lib/xenfsimage/xfs/fsimage.so +lib/xenfsimage/zfs/fsimage.so libdata/pkgconfig/xencall.pc libdata/pkgconfig/xencontrol.pc libdata/pkgconfig/xendevicemodel.pc @@ -258,6 +261,26 @@ libdata/pkgconfig/xenstore.pc libdata/pkgconfig/xentoolcore.pc libdata/pkgconfig/xentoollog.pc libdata/pkgconfig/xlutil.pc +man/man1/xenstore-chmod.1.gz +man/man1/xenstore-ls.1.gz +man/man1/xenstore-read.1.gz +man/man1/xenstore-write.1.gz +man/man1/xenstore.1.gz +man/man1/xentop.1.gz +man/man1/xentrace_format.1.gz +man/man1/xl.1.gz +man/man5/xl-disk-configuration.5.gz +man/man5/xl-network-configuration.5.gz +man/man5/xl.cfg.5.gz +man/man5/xl.conf.5.gz +man/man5/xlcpupool.cfg.5.gz +man/man7/xen-pci-device-reservations.7.gz +man/man7/xen-pv-channel.7.gz +man/man7/xen-tscmode.7.gz +man/man7/xen-vtpm.7.gz +man/man7/xen-vtpmmgr.7.gz +man/man7/xl-numa-placement.7.gz +man/man8/xentrace.8.gz sbin/flask-get-bool sbin/flask-getenforce sbin/flask-label-pci @@ -265,22 +288,20 @@ sbin/flask-loadpolicy sbin/flask-set-bool sbin/flask-setenforce sbin/gdbsx -sbin/kdd -sbin/xen-bugtool sbin/xen-diag sbin/xen-hptool sbin/xen-hvmcrash sbin/xen-hvmctx +sbin/xen-kdd sbin/xen-livepatch sbin/xen-lowmemd sbin/xen-mfndump -sbin/xen-ringwatch sbin/xen-tmem-list-parse sbin/xenbaked sbin/xenconsoled sbin/xencov sbin/xenlockprof -sbin/xenmon.py +sbin/xenmon sbin/xenperf sbin/xenpm sbin/xenpmd @@ -295,7 +316,9 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,arch-arm,hvm,save.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,arch-arm,smccc.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,arch-arm.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,argo.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,callback.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,device_tree_defs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,dom0_ops.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,domctl.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,elfnote.h.html @@ -363,7 +386,9 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,arch-x86,xen-x86_32.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,arch-x86,xen.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,arch-x86_32.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,argo.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,callback.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,device_tree_defs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,dom0_ops.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,domctl.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,elfnote.h.html @@ -430,7 +455,9 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,arch-x86,xen-x86_64.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,arch-x86,xen.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,arch-x86_64.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,argo.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,callback.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,device_tree_defs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,dom0_ops.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,domctl.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,elfnote.h.html @@ -496,6 +523,8 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/man/xen-vtpmmgr.7.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-chmod.1.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-ls.1.html +%%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-read.1.html +%%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-write.1.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore.1.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xentop.1.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xentrace.8.html @@ -507,7 +536,6 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/man/xl.cfg.5.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xl.conf.5.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xlcpupool.cfg.5.html -%%PORTDOCS%%%%DOCSDIR%%/html/misc/9pfs.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/amd-ucode-container.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/arm/big.LITTLE.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/arm/booting.txt @@ -522,63 +550,33 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/misc/arm/silicon-errata.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/block-scripts.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/console.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/coverage.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/crashdb.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/distro_mapping.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/dump-core-format.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/efi.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/grant-tables.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/hvm-emulated-unplug.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/index.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/kconfig-language.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/kconfig.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/kexec_and_kdump.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/libxl_memory.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/livepatch.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/printk-formats.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/pv-drivers-lifecycle.html -%%PORTDOCS%%%%DOCSDIR%%/html/misc/pvcalls.html -%%PORTDOCS%%%%DOCSDIR%%/html/misc/pvh.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/qemu-backends.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/qemu-deprivilege.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/stubdom.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/vtd-pi.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/vtd.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/vtpm-platforms.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/x86-xenpv-bootloader.html -%%PORTDOCS%%%%DOCSDIR%%/html/misc/xen-command-line.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/xen-error-handling.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenmon.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenpaging.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/xenstore-paths.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenstore-ring.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenstore.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/xl-psr.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/xsm-flask.txt -%%DOCS%%man/man1/xenstore-chmod.1.gz -%%DOCS%%man/man1/xenstore-ls.1.gz -%%DOCS%%man/man1/xenstore.1.gz -%%DOCS%%man/man1/xentop.1.gz -%%DOCS%%man/man1/xentrace_format.1.gz -%%DOCS%%man/man1/xl.1.gz -%%DOCS%%man/man5/xl-disk-configuration.5.gz -%%DOCS%%man/man5/xl-network-configuration.5.gz -%%DOCS%%man/man5/xl.cfg.5.gz -%%DOCS%%man/man5/xl.conf.5.gz -%%DOCS%%man/man5/xlcpupool.cfg.5.gz -%%DOCS%%man/man7/xen-pci-device-reservations.7.gz -%%DOCS%%man/man7/xen-pv-channel.7.gz -%%DOCS%%man/man7/xen-tscmode.7.gz -%%DOCS%%man/man7/xen-vtpm.7.gz -%%DOCS%%man/man7/xen-vtpmmgr.7.gz -%%DOCS%%man/man7/xl-numa-placement.7.gz -%%DOCS%%man/man8/xentrace.8.gz share/qemu-xen/qemu/QEMU,cgthree.bin share/qemu-xen/qemu/QEMU,tcx.bin -share/qemu-xen/qemu/acpi-dsdt.aml share/qemu-xen/qemu/bamboo.dtb share/qemu-xen/qemu/bios-256k.bin share/qemu-xen/qemu/bios.bin +share/qemu-xen/qemu/canyonlands.dtb share/qemu-xen/qemu/efi-e1000.rom share/qemu-xen/qemu/efi-e1000e.rom share/qemu-xen/qemu/efi-eepro100.rom @@ -587,6 +585,7 @@ share/qemu-xen/qemu/efi-pcnet.rom share/qemu-xen/qemu/efi-rtl8139.rom share/qemu-xen/qemu/efi-virtio.rom share/qemu-xen/qemu/efi-vmxnet3.rom +share/qemu-xen/qemu/hppa-firmware.img share/qemu-xen/qemu/keymaps/ar share/qemu-xen/qemu/keymaps/bepo share/qemu-xen/qemu/keymaps/common @@ -651,6 +650,7 @@ share/qemu-xen/qemu/skiboot.lid share/qemu-xen/qemu/slof.bin share/qemu-xen/qemu/spapr-rtas.bin share/qemu-xen/qemu/trace-events-all +share/qemu-xen/qemu/u-boot-sam460-20100605.bin share/qemu-xen/qemu/u-boot.e500 share/qemu-xen/qemu/vgabios-cirrus.bin share/qemu-xen/qemu/vgabios-qxl.bin diff --git a/textproc/ansifilter/Makefile b/textproc/ansifilter/Makefile index 1c1c5741b30..b3f497e688a 100644 --- a/textproc/ansifilter/Makefile +++ b/textproc/ansifilter/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ansifilter -PORTVERSION= 2.13 +PORTVERSION= 2.14 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ diff --git a/textproc/ansifilter/distinfo b/textproc/ansifilter/distinfo index 786a4b8ad48..cbada5c95ab 100644 --- a/textproc/ansifilter/distinfo +++ b/textproc/ansifilter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545122828 -SHA256 (ansifilter-2.13.tar.bz2) = 4022e6d763512cbbadc47264266c8796ee654ebd2f43daca4599d1f0281812c0 -SIZE (ansifilter-2.13.tar.bz2) = 439681 +TIMESTAMP = 1556101345 +SHA256 (ansifilter-2.14.tar.bz2) = e2eee3912718b226d3217e2848e5c5a447bf30b7fbb9f0ebc8dd4ddfeb4797af +SIZE (ansifilter-2.14.tar.bz2) = 441884 diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile index a7489071d99..8f9595d74df 100644 --- a/textproc/augeas/Makefile +++ b/textproc/augeas/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= augeas -PORTVERSION= 1.11.0 -PORTREVISION= 2 +PORTVERSION= 1.12.0 CATEGORIES= textproc MASTER_SITES= http://download.augeas.net/ @@ -15,7 +14,7 @@ LICENSE= LGPL21 TEST_DEPENDS= bash:shells/bash \ gsed:textproc/gsed -USES= autoreconf cpe gmake libtool pathfix pkgconfig readline +USES= autoreconf cpe gmake gnome libtool pathfix pkgconfig readline USE_GNOME= libxml2 USE_LDCONFIG= yes diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo index 47cd3429f85..c1eaacc7378 100644 --- a/textproc/augeas/distinfo +++ b/textproc/augeas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535439731 -SHA256 (augeas-1.11.0.tar.gz) = 393ce8f4055af89cd4c20bf903eacbbd909cf427891f41b56dc2ba66243ea0b0 -SIZE (augeas-1.11.0.tar.gz) = 2393675 +TIMESTAMP = 1555260791 +SHA256 (augeas-1.12.0.tar.gz) = 321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87 +SIZE (augeas-1.12.0.tar.gz) = 2429279 diff --git a/textproc/augeas/files/patch-gnulib__lib__Makefile.am b/textproc/augeas/files/patch-gnulib__lib__Makefile.am deleted file mode 100644 index 278cfa82730..00000000000 --- a/textproc/augeas/files/patch-gnulib__lib__Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- gnulib/lib/Makefile.am.orig 2015-05-24 00:50:24 UTC -+++ gnulib/lib/Makefile.am -@@ -463,7 +463,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | mingw* | pw32* | cegcc* | freebsd*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ diff --git a/textproc/augeas/files/patch-lenses_syslog.aug b/textproc/augeas/files/patch-lenses_syslog.aug deleted file mode 100644 index 3190ae428b1..00000000000 --- a/textproc/augeas/files/patch-lenses_syslog.aug +++ /dev/null @@ -1,26 +0,0 @@ ---- lenses/syslog.aug.orig 2018-08-10 20:17:35 UTC -+++ lenses/syslog.aug -@@ -221,7 +221,7 @@ module Syslog = - (* View: entries - entries are either comments/empty lines or entries - *) -- let entries = (empty | comment | entry)* -+ let entries = (empty | comment | entry )* - - (* Group: Program matching *) - -@@ -253,10 +253,13 @@ module Syslog = - - (* Group: Top of the tree *) - -+ let include = -+ [ key "include" . sep_tab . store file_r . eol ] -+ - (* View: lns - generic entries then programs or hostnames matching blocs - *) -- let lns = entries . ( program | hostname )* -+ let lns = entries . ( program | hostname | include )* - - (* Variable: filter - all you need is /etc/syslog.conf diff --git a/textproc/augeas/files/patch-lenses_tests_test__syslog.aug b/textproc/augeas/files/patch-lenses_tests_test__syslog.aug deleted file mode 100644 index e252f003909..00000000000 --- a/textproc/augeas/files/patch-lenses_tests_test__syslog.aug +++ /dev/null @@ -1,9 +0,0 @@ ---- lenses/tests/test_syslog.aug.orig 2018-08-10 20:17:35 UTC -+++ lenses/tests/test_syslog.aug -@@ -351,3 +351,6 @@ daemon.info - (* allow space before comments *) - test Syslog.lns get " \t# space comment\n" = - { "#comment" = "space comment" } -+ -+ test Syslog.lns get "include /etc/syslog.d\n" = -+ { "include" = "/etc/syslog.d" } diff --git a/textproc/augeas/files/patch-tests_root_etc_syslog.conf b/textproc/augeas/files/patch-tests_root_etc_syslog.conf deleted file mode 100644 index 0ad9312fae7..00000000000 --- a/textproc/augeas/files/patch-tests_root_etc_syslog.conf +++ /dev/null @@ -1,41 +0,0 @@ ---- tests/root/etc/syslog.conf.orig 2018-10-25 13:34:21 UTC -+++ tests/root/etc/syslog.conf -@@ -0,0 +1,38 @@ -+# $FreeBSD$ -+# -+# Spaces ARE valid field separators in this file. However, -+# other *nix-like systems still insist on using tabs as field -+# separators. If you are sharing this file between systems, you -+# may want to use only tabs as field separators here. -+# Consult the syslog.conf(5) manpage. -+*.err;kern.warning;auth.notice;mail.crit /dev/console -+*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages -+security.* /var/log/security -+auth.info;authpriv.info /var/log/auth.log -+mail.info /var/log/maillog -+lpr.info /var/log/lpd-errs -+ftp.info /var/log/xferlog -+cron.* /var/log/cron -+!-devd -+*.=debug /var/log/debug.log -+*.emerg * -+# uncomment this to log all writes to /dev/console to /var/log/console.log -+# touch /var/log/console.log and chmod it to mode 600 before it will work -+#console.info /var/log/console.log -+# uncomment this to enable logging of all log messages to /var/log/all.log -+# touch /var/log/all.log and chmod it to mode 600 before it will work -+#*.* /var/log/all.log -+# uncomment this to enable logging to a remote loghost named loghost -+#*.* @loghost -+# uncomment these if you're running inn -+# news.crit /var/log/news/news.crit -+# news.err /var/log/news/news.err -+# news.notice /var/log/news/news.notice -+# Uncomment this if you wish to see messages produced by devd -+# !devd -+# *.>=notice /var/log/devd.log -+!ppp -+*.* /var/log/ppp.log -+!* -+include /etc/syslog.d -+include /usr/local/etc/syslog.d diff --git a/textproc/augeas/pkg-plist b/textproc/augeas/pkg-plist index c0430192879..ecbb8800230 100644 --- a/textproc/augeas/pkg-plist +++ b/textproc/augeas/pkg-plist @@ -7,11 +7,11 @@ include/fa.h lib/libaugeas.a lib/libaugeas.so lib/libaugeas.so.0 -lib/libaugeas.so.0.24.1 +lib/libaugeas.so.0.24.2 lib/libfa.a lib/libfa.so lib/libfa.so.1 -lib/libfa.so.1.5.2 +lib/libfa.so.1.5.3 libdata/pkgconfig/augeas.pc man/man1/augmatch.1.gz man/man1/augparse.1.gz diff --git a/textproc/docbook2mdoc/Makefile b/textproc/docbook2mdoc/Makefile index e3c4a4ab356..031553c7eb1 100644 --- a/textproc/docbook2mdoc/Makefile +++ b/textproc/docbook2mdoc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= docbook2mdoc -PORTVERSION= 0.0.9 +PORTVERSION= 1.0.0 PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://mdocml.bsd.lv/docbook2mdoc/snapshots/ @@ -11,14 +11,9 @@ COMMENT= Convert DocBook refentry to mdoc LICENSE= ISCL -LIB_DEPENDS= libexpat.so:textproc/expat2 - PLIST_FILES= bin/docbook2mdoc \ man/man1/docbook2mdoc.1.gz USES= tar:tgz -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - .include diff --git a/textproc/docbook2mdoc/distinfo b/textproc/docbook2mdoc/distinfo index fde7bbf3b6a..17ea5dcd34c 100644 --- a/textproc/docbook2mdoc/distinfo +++ b/textproc/docbook2mdoc/distinfo @@ -1,2 +1,3 @@ -SHA256 (docbook2mdoc-0.0.9.tgz) = 93320aa42cbcc2a8e43aceff3ef97af83ba65a87c6e745aa37ae27f43440341e -SIZE (docbook2mdoc-0.0.9.tgz) = 13022 +TIMESTAMP = 1556027440 +SHA256 (docbook2mdoc-1.0.0.tgz) = 940b774abfc9fb60c8d9cf46cecbf704c5a60fbb4f6ca85073fdfda26706629c +SIZE (docbook2mdoc-1.0.0.tgz) = 24393 diff --git a/textproc/docbook2mdoc/files/patch-Makefile b/textproc/docbook2mdoc/files/patch-Makefile deleted file mode 100644 index b021e35e7fa..00000000000 --- a/textproc/docbook2mdoc/files/patch-Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.orig 2014-04-30 13:21:35 UTC -+++ Makefile -@@ -1,19 +1,19 @@ - VERSION = 0.0.9 - CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings - WWWPREFIX = /usr/vhosts/mdocml.bsd.lv/www/htdocs/docbook2mdoc --PREFIX = /usr/local -+PREFIX ?= /usr/local - - all: docbook2mdoc - - docbook2mdoc: docbook2mdoc.o rules.o -- $(CC) -o $@ docbook2mdoc.o rules.o -lexpat -+ $(CC) -o $@ docbook2mdoc.o rules.o ${LDFLAGS} -lexpat - - www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt - - install: all - mkdir -p $(DESTDIR)$(PREFIX)/bin - mkdir -p $(DESTDIR)$(PREFIX)/man/man1 -- install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin -+ install -s -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin - install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1 - - installwww: www diff --git a/textproc/docbook2mdoc/files/patch-parse.c b/textproc/docbook2mdoc/files/patch-parse.c new file mode 100644 index 00000000000..6e6bc845ca3 --- /dev/null +++ b/textproc/docbook2mdoc/files/patch-parse.c @@ -0,0 +1,20 @@ +--- parse.c.orig 2019-04-17 18:31:23 UTC ++++ parse.c +@@ -553,7 +553,7 @@ xml_attrkey(struct parse *p, const char *name) + const char *value; + enum attrkey key; + +- if (p->del > 0 || p->ncur == NODE_IGNORE || *name == '\0') ++ if (p->del > 0 || p->ncur == NODE_UNKNOWN || *name == '\0') + return; + + if ((p->ncur == NODE_DOCTYPE || p->ncur == NODE_ENTITY) && +@@ -590,7 +590,7 @@ xml_attrval(struct parse *p, const char *name) + { + struct pattr *a; + +- if (p->del > 0 || p->ncur == NODE_IGNORE || ++ if (p->del > 0 || p->ncur == NODE_UNKNOWN || + (p->flags & PFLAG_ATTR) == 0) + return; + if ((a = TAILQ_LAST(&p->cur->attrq, pattrq)) == NULL) diff --git a/textproc/htmldoc/files/patch-htmldoc_ps-pdf.cxx b/textproc/htmldoc/files/patch-htmldoc_ps-pdf.cxx new file mode 100644 index 00000000000..93762c943ce --- /dev/null +++ b/textproc/htmldoc/files/patch-htmldoc_ps-pdf.cxx @@ -0,0 +1,15 @@ +Workaround for potential optimizer bug in clang 8 that causes hangs at runtime + +https://github.com/michaelrsweet/htmldoc/issues/349 + +--- htmldoc/ps-pdf.cxx.orig 2018-04-10 11:56:03 UTC ++++ htmldoc/ps-pdf.cxx +@@ -5361,7 +5361,7 @@ parse_pre(tree_t *t, /* I - Tree to parse */ + line[10240], + *lineptr, + *dataptr; +- int col; ++ volatile int col; + float width, + height, + rgb[3]; diff --git a/textproc/p5-Text-ANSI-Util/Makefile b/textproc/p5-Text-ANSI-Util/Makefile index 057c6c95931..1d0153c45f7 100644 --- a/textproc/p5-Text-ANSI-Util/Makefile +++ b/textproc/p5-Text-ANSI-Util/Makefile @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= Text-ANSI-Util -PORTVERSION= 0.22 +PORTVERSION= 0.23 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- +DISTNAME= ${PORTNAME}-${PORTVERSION}0 MAINTAINER= sunpoet@FreeBSD.org COMMENT= Routines for text containing ANSI color codes @@ -21,4 +22,11 @@ USE_PERL5= configure NO_ARCH= yes -.include +.include + +.if ${PERL_LEVEL} < 502600 +BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils +RUN_DEPENDS+= p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils +.endif + +.include diff --git a/textproc/p5-Text-ANSI-Util/distinfo b/textproc/p5-Text-ANSI-Util/distinfo index 13a6986e6cb..40fe558cc6f 100644 --- a/textproc/p5-Text-ANSI-Util/distinfo +++ b/textproc/p5-Text-ANSI-Util/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552168548 -SHA256 (Text-ANSI-Util-0.22.tar.gz) = c96a915621c5acefa4031c755b248a25bc173b9682a0a483b7b6f8cc8a1dca02 -SIZE (Text-ANSI-Util-0.22.tar.gz) = 28122 +TIMESTAMP = 1556029596 +SHA256 (Text-ANSI-Util-0.230.tar.gz) = 36ebd6b30cb9a6353e669fa6b5112863a8f492a186c3a3acb911032c62ad5442 +SIZE (Text-ANSI-Util-0.230.tar.gz) = 29644 diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile index bea458d51de..eaefec7ee9e 100644 --- a/textproc/p5-XML-DT/Makefile +++ b/textproc/p5-XML-DT/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= XML-DT -PORTVERSION= 0.68 +PORTVERSION= 0.69 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-XML-DTDParser>=2.00:textproc/p5-XML-DTDParser \ - p5-XML-LibXML>=1.54:textproc/p5-XML-LibXML \ - p5-libwww>=1.35:www/p5-libwww +RUN_DEPENDS= p5-HTTP-Simple>=0:www/p5-HTTP-Simple \ + p5-XML-DTDParser>=2.00:textproc/p5-XML-DTDParser \ + p5-XML-LibXML>=1.54:textproc/p5-XML-LibXML USES= perl5 USE_PERL5= configure diff --git a/textproc/p5-XML-DT/distinfo b/textproc/p5-XML-DT/distinfo index 1dfd44137e7..15b13bd646a 100644 --- a/textproc/p5-XML-DT/distinfo +++ b/textproc/p5-XML-DT/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539152676 -SHA256 (XML-DT-0.68.tar.gz) = fd44da80de086ddba5d5efd1407c2ad4fd76c4fcfcceafa3101b60df37c09bd6 -SIZE (XML-DT-0.68.tar.gz) = 31150 +TIMESTAMP = 1556029619 +SHA256 (XML-DT-0.69.tar.gz) = 2f80b710ae0af4e700e7b94840fecab2c3af1268ea28562db26ce297bc81368d +SIZE (XML-DT-0.69.tar.gz) = 31757 diff --git a/textproc/p5-XML-DTDParser/Makefile b/textproc/p5-XML-DTDParser/Makefile index c5e85f9ad4c..627d568bbb0 100644 --- a/textproc/p5-XML-DTDParser/Makefile +++ b/textproc/p5-XML-DTDParser/Makefile @@ -14,13 +14,14 @@ COMMENT= Perl module for parsing XML DTD strings USES= perl5 USE_PERL5= configure +NO_ARCH= yes + OPTIONS_DEFINE= DOCS PORTDOCS= Changes -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/textproc/rubygem-gitlab-markup/Makefile b/textproc/rubygem-gitlab-markup/Makefile index 96df7790ab4..e7268435270 100644 --- a/textproc/rubygem-gitlab-markup/Makefile +++ b/textproc/rubygem-gitlab-markup/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitlab-markup -PORTVERSION= 1.6.5 +PORTVERSION= 1.7.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-gitlab-markup/distinfo b/textproc/rubygem-gitlab-markup/distinfo index 039ea227860..c136fc6980c 100644 --- a/textproc/rubygem-gitlab-markup/distinfo +++ b/textproc/rubygem-gitlab-markup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541099508 -SHA256 (rubygem/gitlab-markup-1.6.5.gem) = de11fde43a459603bfce0a00f10e87225269871d26b533ef1095b45817fc9f8a -SIZE (rubygem/gitlab-markup-1.6.5.gem) = 28160 +TIMESTAMP = 1555690222 +SHA256 (rubygem/gitlab-markup-1.7.0.gem) = 0d819e730acaeab9b25f95e24afb8d7d6c4ff4e95eaee1b51f191debab1c0e67 +SIZE (rubygem/gitlab-markup-1.7.0.gem) = 28160 diff --git a/www/Makefile b/www/Makefile index 5b6236c5e5d..1d4a5799ea0 100644 --- a/www/Makefile +++ b/www/Makefile @@ -993,6 +993,7 @@ SUBDIR += p5-HTTP-Session-State-MobileAgentID SUBDIR += p5-HTTP-Session-Store-DBI SUBDIR += p5-HTTP-Session2 + SUBDIR += p5-HTTP-Simple SUBDIR += p5-HTTP-SimpleLinkChecker SUBDIR += p5-HTTP-Size SUBDIR += p5-HTTP-Thin @@ -2048,7 +2049,6 @@ SUBDIR += rubygem-jekyll-watch SUBDIR += rubygem-journey SUBDIR += rubygem-jquery-atwho-rails - SUBDIR += rubygem-jquery-atwho-rails13 SUBDIR += rubygem-jquery-rails SUBDIR += rubygem-jquery-rails-rails5 SUBDIR += rubygem-jquery-rails-rails50 @@ -2168,7 +2168,6 @@ SUBDIR += rubygem-savon SUBDIR += rubygem-sawyer SUBDIR += rubygem-select2-rails - SUBDIR += rubygem-select2-rails3 SUBDIR += rubygem-selenium-webdriver SUBDIR += rubygem-semantic-ui-sass SUBDIR += rubygem-simple-rss diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 3f32d076923..0c8b8f52e9b 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.9.7 -PORTREVISION= 1 +PORTVERSION= 11.10.0 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -17,13 +17,13 @@ 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.7.1:devel/gitlab-shell \ - gitlab-workhorse>=8.3.3:www/gitlab-workhorse \ - gitaly>=1.27.1:devel/gitaly \ + gitlab-shell>=9.0.0:devel/gitlab-shell \ + gitlab-workhorse>=8.5.1:www/gitlab-workhorse \ + gitaly>=1.33.0:devel/gitaly \ gitlab-pages>=1.5.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ yarn>=1.10.0:www/yarn \ - rubygem-rails50>=5.0.7.1:www/rubygem-rails50 \ + rubygem-rails50>=5.0.7.2:www/rubygem-rails50 \ rubygem-rails-deprecated_sanitizer-rails50>=1.0.3:devel/rubygem-rails-deprecated_sanitizer-rails50 \ rubygem-nakayoshi_fork>=0.0.4:devel/rubygem-nakayoshi_fork \ rubygem-responders-rails50>=2.0:www/rubygem-responders-rails50 \ @@ -50,9 +50,9 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \ rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \ rubygem-omniauth-authentiq>=0.3.3:net/rubygem-omniauth-authentiq \ - rubygem-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \ + rubygem-rack-oauth2>=1.9.3:security/rubygem-rack-oauth2 \ rubygem-jwt>=2.1.0:www/rubygem-jwt \ - rubygem-recaptcha3>=3.0:devel/rubygem-recaptcha3 \ + rubygem-recaptcha>=4.11:devel/rubygem-recaptcha \ rubygem-akismet>=2.0:devel/rubygem-akismet \ rubygem-devise-two-factor-rails50>=3.0.0:security/rubygem-devise-two-factor-rails50 \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ @@ -86,7 +86,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.2.0:www/rubygem-deckar01-task_list \ - rubygem-gitlab-markup>=1.6.5:textproc/rubygem-gitlab-markup \ + rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0:textproc/rubygem-github-markup17 \ rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ @@ -98,24 +98,24 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-asciidoctor-plantuml>=0.0.8:textproc/rubygem-asciidoctor-plantuml \ rubygem-rouge>=3.1:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11:textproc/rubygem-truncato \ - rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ + rubygem-bootstrap_form>=4.2.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.10.1:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \ - rubygem-rack>=2.0.6:www/rubygem-rack \ + rubygem-rack>=2.0.7:www/rubygem-rack \ rubygem-unicorn>=5.4.1:www/rubygem-unicorn \ rubygem-unicorn-worker-killer>=0.4.4:www/rubygem-unicorn-worker-killer \ rubygem-puma>=3.12:www/rubygem-puma \ rubygem-puma_worker_killer>=0:www/rubygem-puma_worker_killer \ rubygem-state_machines-activerecord05>=0.5.1:databases/rubygem-state_machines-activerecord05 \ - rubygem-acts-as-taggable-on>=5.0:www/rubygem-acts-as-taggable-on \ + rubygem-acts-as-taggable-on>=6.0:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=1.0.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \ rubygem-gitlab-sidekiq-fetcher>=0.4.0:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit>=1.1:devel/rubygem-fugit \ - rubygem-httparty>=0.13.3:www/rubygem-httparty \ + rubygem-httparty>=0.16.4:www/rubygem-httparty \ rubygem-rainbow>=3.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ @@ -127,6 +127,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-redis3>=3.2:databases/rubygem-redis3 \ rubygem-connection_pool>=2.0:net/rubygem-connection_pool \ rubygem-discordrb-webhooks-blackst0ne>=3.3.0:net-im/rubygem-discordrb-webhooks-blackst0ne \ + rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ rubygem-flowdock>=0.7:www/rubygem-flowdock \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ @@ -154,9 +155,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-font-awesome-rails-rails50>=4.7:devel/rubygem-font-awesome-rails-rails50 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ rubygem-gon-rails50>=6.2.0:www/rubygem-gon-rails50 \ - rubygem-jquery-atwho-rails13>=1.3.2:www/rubygem-jquery-atwho-rails13 \ rubygem-request_store>=1.3:devel/rubygem-request_store \ - rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ rubygem-base32>=0.3.0:converters/rubygem-base32 \ rubygem-sentry-raven>=2.7:devel/rubygem-sentry-raven \ @@ -188,7 +187,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-sshkey>=2.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto>=1.13.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=1.19.0:net/rubygem-gitaly-proto \ rubygem-grpc>=1.15.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf \ @@ -204,6 +203,12 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ RUN_DEPENDS= ${MY_DEPENDS} +CONFLICTS_INSTALL= gitolite-* \ + gitolite2-* \ + gogs-* \ + gitea-* \ + ${PYTHON_PKGNAMEPREFIX}-gitosis-* + OPTIONS_SINGLE= DATABASE OPTIONS_SINGLE_DATABASE= PGSQL MYSQL OPTIONS_DEFAULT= PGSQL @@ -221,7 +226,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= 93e321569a898d9701a251b4bb73ad56b79fc535 +GL_COMMIT= 8a802d1c6b7ee660fbf701b9758ccff85f065e68 USERS= git GROUPS= git @@ -263,7 +268,7 @@ do-install: ${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample - ${MKDIR} ${STAGEDIR}/usr/home/git/repositories + ${MKDIR} ${STAGEDIR}/usr/local/git/repositories ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 2155bdec470..a6340d91eb7 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554961124 -SHA256 (gitlab-org-gitlab-ce-93e321569a898d9701a251b4bb73ad56b79fc535_GL0.tar.gz) = b435ba669451bb03c0056942ea2d0bdbf224ce9056533008bbaa7f03b80a044b -SIZE (gitlab-org-gitlab-ce-93e321569a898d9701a251b4bb73ad56b79fc535_GL0.tar.gz) = 61548547 +TIMESTAMP = 1555689889 +SHA256 (gitlab-org-gitlab-ce-8a802d1c6b7ee660fbf701b9758ccff85f065e68_GL0.tar.gz) = 5a9ae0ae2c77280b9270e8f232b5388a48c6c40a9e0351af1f37a30547e028ee +SIZE (gitlab-org-gitlab-ce-8a802d1c6b7ee660fbf701b9758ccff85f065e68_GL0.tar.gz) = 62602006 diff --git a/www/gitlab-ce/files/gitlab.in b/www/gitlab-ce/files/gitlab.in index 7320e30adc7..6a57d523497 100644 --- a/www/gitlab-ce/files/gitlab.in +++ b/www/gitlab-ce/files/gitlab.in @@ -13,8 +13,8 @@ # chkconfig: - 85 14 ### END INIT INFO -# Maintainer: Torsten Zuehlsdorff -# Based on work of: @charlienewey, rovanion.luckey@gmail.com, @randx +# Maintainer: Matthias Fechner +# Based on work of: @charlienewey, rovanion.luckey@gmail.com, @randx, @tz # PROVIDE: gitlab # REQUIRE: LOGIN @@ -42,6 +42,7 @@ restart_cmd="restart_gitlab" : ${gitlab_workhorse_tcp:="NO"} : ${gitlab_workhorse_addr:="127.0.0.1:8181"} : ${gitlab_mail_room_enable:="NO"} +: ${gitlab_allow_conflicts:="NO"} load_rc_config $name @@ -86,6 +87,44 @@ gitaly_log="$app_root/log/gitaly.log" # Read configuration variable file if it is present test -f /etc/default/gitlab && . /etc/default/gitlab +# Check if other colliding packages are installed +if `/usr/sbin/pkg -N info -e gogs` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with gogs as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi +if `/usr/sbin/pkg -N info -e "gitolite*"` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with gitolite as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi +if `/usr/sbin/pkg -N info -e "*gitosis*"` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with py-gitosis as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi +if `/usr/sbin/pkg -N info -e gitea` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with gitea as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi + # Switch to the app_user if it is not he/she who is running the script. if [ "$USER" != "$app_user" ]; then # Regenerate the Gemfile.lock for all related products diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index c8a02b21414..6cee6306bfe 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,13 +1,5 @@ ---- Gemfile.orig 2019-03-20 23:32:21 UTC +--- Gemfile.orig 2019-04-19 09:51:35 UTC +++ Gemfile -@@ -1,6 +1,6 @@ - source 'https://rubygems.org' - --gem 'rails', '5.0.7.1' -+gem 'rails', '5.0.7.2' - gem 'rails-deprecated_sanitizer', '~> 1.0.3' - - # Improves copy-on-write performance for MRI @@ -15,7 +15,7 @@ gem 'sprockets', '~> 3.7.0' gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' @@ -17,16 +9,16 @@ gem 'pg', '~> 1.1', group: :postgres gem 'rugged', '~> 0.28' -@@ -170,7 +170,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si - gem 'fugit', '~> 1.1' +@@ -202,7 +202,7 @@ gem 'connection_pool', '~> 2.0' + gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false - # HTTP requests --gem 'httparty', '~> 0.13.3' -+gem 'httparty', '>= 0.13.3' + # HipChat integration +-gem 'hipchat', '~> 1.5.0' ++gem 'hipchat', '~> 1.6.0' - # Colored output to console - gem 'rainbow', '~> 3.0' -@@ -295,9 +295,6 @@ gem 'peek-redis', '~> 1.2.0' + # JIRA integration + gem 'jira-ruby', '~> 1.4' +@@ -293,9 +293,6 @@ gem 'peek-redis', '~> 1.2.0' # Metrics group :metrics do @@ -36,7 +28,7 @@ # Prometheus gem 'prometheus-client-mmap', '~> 0.9.4' gem 'raindrops', '~> 0.18' -@@ -307,87 +304,6 @@ group :tracing do +@@ -305,87 +302,6 @@ group :tracing do # OpenTracing gem 'opentracing', '~> 0.4.3' gem 'jaeger-client', '~> 0.10.0' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 389b871ccce..e16c7584f6f 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 2019-03-20 23:32:21 UTC +--- config/gitlab.yml.example.orig 2019-04-19 09:51:35 UTC +++ config/gitlab.yml.example @@ -248,7 +248,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 -@@ -645,7 +645,7 @@ production: &base +@@ -649,7 +649,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,27 +18,34 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -663,8 +663,8 @@ production: &base +@@ -667,8 +667,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: - path: /home/git/repositories/ - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). -+ path: /usr/home/git/repositories/ -+ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). ++ path: /usr/local/git/repositories/ ++ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -696,7 +696,7 @@ production: &base +@@ -700,12 +700,12 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ +- authorized_keys_file: /home/git/.ssh/authorized_keys + path: %%PREFIX%%/share/gitlab-shell/ ++ authorized_keys_file: %%PREFIX%%/git/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -721,7 +721,7 @@ production: &base +- # secret_file: /home/git/gitlab/.gitlab_shell_secret ++ # secret_file: /usr/local/www/gitlab-ce/.gitlab_shell_secret + + # Git over HTTP + upload_pack: true +@@ -726,7 +726,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb index 6d8a929a7a4..cd757c71b9c 100644 --- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2018-12-21 14:23:37 UTC +--- config/initializers/1_settings.rb.orig 2019-04-19 09:51:35 UTC +++ config/initializers/1_settings.rb -@@ -126,12 +126,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA +@@ -145,12 +145,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index 6eecac4692f..44168fdac23 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -1,15 +1,19 @@ vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv GITLAB vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Gitlab was installed successfully. + +!! WARNING: Please make sure you read in UPDATING entry 20190423 !! + + 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.9-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.10-freebsd.md If you just installed an major upgrade of GitLab, for example you switched from 11.8.x to 11.9.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.8-11.9-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.9-11.10-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 30178ab345e..0b9d70188a4 100644 --- a/www/gitlab-ce/pkg-plist +++ b/www/gitlab-ce/pkg-plist @@ -11,6 +11,7 @@ %%WWWDIR%%/.gitlab/issue_templates/Acceptance_Testing.md %%WWWDIR%%/.gitlab/issue_templates/Bug.md %%WWWDIR%%/.gitlab/issue_templates/Coding style proposal.md +%%WWWDIR%%/.gitlab/issue_templates/Database Reviewer.md %%WWWDIR%%/.gitlab/issue_templates/Doc Review.md %%WWWDIR%%/.gitlab/issue_templates/Documentation.md %%WWWDIR%%/.gitlab/issue_templates/Feature proposal.md @@ -47,6 +48,8 @@ %%WWWDIR%%/MAINTENANCE.md %%WWWDIR%%/PHILOSOPHY.md %%WWWDIR%%/PROCESS.md +%%WWWDIR%%/Pipfile +%%WWWDIR%%/Pipfile.lock %%WWWDIR%%/Procfile %%WWWDIR%%/README.md %%WWWDIR%%/Rakefile @@ -1927,6 +1930,9 @@ %%WWWDIR%%/app/assets/images/none-scheme-preview.png %%WWWDIR%%/app/assets/images/old_repo.png %%WWWDIR%%/app/assets/images/onion_skin_sprites.gif +%%WWWDIR%%/app/assets/images/select2-spinner.gif +%%WWWDIR%%/app/assets/images/select2.png +%%WWWDIR%%/app/assets/images/select2x2.png %%WWWDIR%%/app/assets/images/solarized-dark-scheme-preview.png %%WWWDIR%%/app/assets/images/solarized-light-scheme-preview.png %%WWWDIR%%/app/assets/images/swipemode_sprites.gif @@ -1939,6 +1945,7 @@ %%WWWDIR%%/app/assets/javascripts/ajax_loading_spinner.js %%WWWDIR%%/app/assets/javascripts/api.js %%WWWDIR%%/app/assets/javascripts/autosave.js +%%WWWDIR%%/app/assets/javascripts/avatar_picker.js %%WWWDIR%%/app/assets/javascripts/awards_handler.js %%WWWDIR%%/app/assets/javascripts/badges/components/badge.vue %%WWWDIR%%/app/assets/javascripts/badges/components/badge_form.vue @@ -2232,9 +2239,16 @@ %%WWWDIR%%/app/assets/javascripts/environments/folder/environments_folder_bundle.js %%WWWDIR%%/app/assets/javascripts/environments/folder/environments_folder_view.vue %%WWWDIR%%/app/assets/javascripts/environments/index.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/canary_callout_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/container_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environment_item_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_app_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js %%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_table_mixin.js %%WWWDIR%%/app/assets/javascripts/environments/services/environments_service.js %%WWWDIR%%/app/assets/javascripts/environments/stores/environments_store.js +%%WWWDIR%%/app/assets/javascripts/environments/stores/helpers.js %%WWWDIR%%/app/assets/javascripts/error_tracking/components/error_tracking_list.vue %%WWWDIR%%/app/assets/javascripts/error_tracking/index.js %%WWWDIR%%/app/assets/javascripts/error_tracking/services/index.js @@ -2280,6 +2294,7 @@ %%WWWDIR%%/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js %%WWWDIR%%/app/assets/javascripts/filtered_search/null_dropdown.js %%WWWDIR%%/app/assets/javascripts/filtered_search/recent_searches_root.js +%%WWWDIR%%/app/assets/javascripts/filtered_search/recent_searches_storage_keys.js %%WWWDIR%%/app/assets/javascripts/filtered_search/services/recent_searches_service.js %%WWWDIR%%/app/assets/javascripts/filtered_search/services/recent_searches_service_error.js %%WWWDIR%%/app/assets/javascripts/filtered_search/stores/recent_searches_store.js @@ -2308,7 +2323,6 @@ %%WWWDIR%%/app/assets/javascripts/gl_form.js %%WWWDIR%%/app/assets/javascripts/gpg_badges.js %%WWWDIR%%/app/assets/javascripts/group.js -%%WWWDIR%%/app/assets/javascripts/group_avatar.js %%WWWDIR%%/app/assets/javascripts/group_label_subscription.js %%WWWDIR%%/app/assets/javascripts/groups/components/app.vue %%WWWDIR%%/app/assets/javascripts/groups/components/group_folder.vue @@ -2333,6 +2347,7 @@ %%WWWDIR%%/app/assets/javascripts/help/help.js %%WWWDIR%%/app/assets/javascripts/helpers/avatar_helper.js %%WWWDIR%%/app/assets/javascripts/helpers/issuables_helper.js +%%WWWDIR%%/app/assets/javascripts/helpers/monitor_helper.js %%WWWDIR%%/app/assets/javascripts/how_to_merge.js %%WWWDIR%%/app/assets/javascripts/ide/components/activity_bar.vue %%WWWDIR%%/app/assets/javascripts/ide/components/branches/item.vue @@ -2518,6 +2533,7 @@ %%WWWDIR%%/app/assets/javascripts/issue_show/mixins/update.js %%WWWDIR%%/app/assets/javascripts/issue_show/services/index.js %%WWWDIR%%/app/assets/javascripts/issue_show/stores/index.js +%%WWWDIR%%/app/assets/javascripts/issue_show/utils/parse_data.js %%WWWDIR%%/app/assets/javascripts/issue_status_select.js %%WWWDIR%%/app/assets/javascripts/jobs/components/artifacts_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/commit_block.vue @@ -2534,6 +2550,7 @@ %%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/components/unmet_prerequisites_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/index.js %%WWWDIR%%/app/assets/javascripts/jobs/mixins/delayed_job_mixin.js %%WWWDIR%%/app/assets/javascripts/jobs/store/actions.js @@ -2555,6 +2572,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/accessor.js %%WWWDIR%%/app/assets/javascripts/lib/utils/ace_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/ajax_cache.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/autosave.js %%WWWDIR%%/app/assets/javascripts/lib/utils/axios_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js %%WWWDIR%%/app/assets/javascripts/lib/utils/cache.js @@ -2566,6 +2584,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/dom_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/file_upload.js %%WWWDIR%%/app/assets/javascripts/lib/utils/grammar.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/highlight.js %%WWWDIR%%/app/assets/javascripts/lib/utils/http_status.js %%WWWDIR%%/app/assets/javascripts/lib/utils/icon_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/image_utility.js @@ -2618,6 +2637,7 @@ %%WWWDIR%%/app/assets/javascripts/monitoring/monitoring_bundle.js %%WWWDIR%%/app/assets/javascripts/monitoring/services/monitoring_service.js %%WWWDIR%%/app/assets/javascripts/monitoring/stores/monitoring_store.js +%%WWWDIR%%/app/assets/javascripts/monitoring/utils.js %%WWWDIR%%/app/assets/javascripts/mr_notes/index.js %%WWWDIR%%/app/assets/javascripts/mr_notes/init_notes.js %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/actions.js @@ -2626,6 +2646,10 @@ %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/modules/index.js %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/mutations.js +%%WWWDIR%%/app/assets/javascripts/mr_popover/components/mr_popover.vue +%%WWWDIR%%/app/assets/javascripts/mr_popover/constants.js +%%WWWDIR%%/app/assets/javascripts/mr_popover/index.js +%%WWWDIR%%/app/assets/javascripts/mr_popover/queries/merge_request.graphql %%WWWDIR%%/app/assets/javascripts/namespace_select.js %%WWWDIR%%/app/assets/javascripts/network/branch_graph.js %%WWWDIR%%/app/assets/javascripts/network/raphael.js @@ -2731,6 +2755,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/show/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/details/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/group_members/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/index.js @@ -2745,7 +2770,8 @@ %%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/shared/group_details.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/shared/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 @@ -2946,7 +2972,9 @@ %%WWWDIR%%/app/assets/javascripts/pipelines/constants.js %%WWWDIR%%/app/assets/javascripts/pipelines/event_hub.js %%WWWDIR%%/app/assets/javascripts/pipelines/mixins/graph_component_mixin.js +%%WWWDIR%%/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js %%WWWDIR%%/app/assets/javascripts/pipelines/mixins/pipelines.js +%%WWWDIR%%/app/assets/javascripts/pipelines/mixins/stage_column_mixin.js %%WWWDIR%%/app/assets/javascripts/pipelines/pipeline_details_bundle.js %%WWWDIR%%/app/assets/javascripts/pipelines/pipeline_details_mediator.js %%WWWDIR%%/app/assets/javascripts/pipelines/services/pipeline_service.js @@ -3009,6 +3037,13 @@ %%WWWDIR%%/app/assets/javascripts/registry/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/registry/stores/mutations.js %%WWWDIR%%/app/assets/javascripts/registry/stores/state.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/index.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/actions.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/index.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/state.js %%WWWDIR%%/app/assets/javascripts/releases/components/app.vue %%WWWDIR%%/app/assets/javascripts/releases/components/release_block.vue %%WWWDIR%%/app/assets/javascripts/releases/index.js @@ -3038,18 +3073,25 @@ %%WWWDIR%%/app/assets/javascripts/reports/store/utils.js %%WWWDIR%%/app/assets/javascripts/right_sidebar.js %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js +%%WWWDIR%%/app/assets/javascripts/serverless/components/area.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/empty_state.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/environment_row.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/function_details.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/function_row.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/functions.vue +%%WWWDIR%%/app/assets/javascripts/serverless/components/missing_prometheus.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/pod_box.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/url.vue +%%WWWDIR%%/app/assets/javascripts/serverless/constants.js %%WWWDIR%%/app/assets/javascripts/serverless/event_hub.js %%WWWDIR%%/app/assets/javascripts/serverless/serverless_bundle.js -%%WWWDIR%%/app/assets/javascripts/serverless/services/get_functions_service.js -%%WWWDIR%%/app/assets/javascripts/serverless/stores/serverless_details_store.js -%%WWWDIR%%/app/assets/javascripts/serverless/stores/serverless_store.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/actions.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/getters.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/index.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/state.js +%%WWWDIR%%/app/assets/javascripts/serverless/utils.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/event_hub.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue @@ -3118,6 +3160,7 @@ %%WWWDIR%%/app/assets/javascripts/version_check_image.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_alert_message.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue @@ -3153,6 +3196,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/constants.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/event_hub.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/index.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/mixins/mr_widget_pipeline.js @@ -3211,12 +3255,14 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/lib/utils/diff_utils.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/lib/utils/dom_utils.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/field.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/header.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_row.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue @@ -3232,7 +3278,10 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pikaday.vue %%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/project_selector/project_list_item.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/recaptcha_modal.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/resizable_chart/resizable_chart_container.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/select2_select.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 @@ -3246,6 +3295,8 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_regular_label.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_scoped_label.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue @@ -3284,7 +3335,9 @@ %%WWWDIR%%/app/assets/stylesheets/behaviors.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap_migration.scss +%%WWWDIR%%/app/assets/stylesheets/components/dashboard_skeleton.scss %%WWWDIR%%/app/assets/stylesheets/components/popover.scss +%%WWWDIR%%/app/assets/stylesheets/components/project_list_item.scss %%WWWDIR%%/app/assets/stylesheets/components/related_items_list.scss %%WWWDIR%%/app/assets/stylesheets/csslab.scss %%WWWDIR%%/app/assets/stylesheets/emoji_sprites.scss @@ -3340,6 +3393,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework/selects.scss %%WWWDIR%%/app/assets/stylesheets/framework/sidebar.scss %%WWWDIR%%/app/assets/stylesheets/framework/snippets.scss +%%WWWDIR%%/app/assets/stylesheets/framework/sortable.scss %%WWWDIR%%/app/assets/stylesheets/framework/spinner.scss %%WWWDIR%%/app/assets/stylesheets/framework/stacked_progress_bar.scss %%WWWDIR%%/app/assets/stylesheets/framework/system_messages.scss @@ -3398,6 +3452,7 @@ %%WWWDIR%%/app/assets/stylesheets/pages/merge_conflicts.scss %%WWWDIR%%/app/assets/stylesheets/pages/merge_requests.scss %%WWWDIR%%/app/assets/stylesheets/pages/milestone.scss +%%WWWDIR%%/app/assets/stylesheets/pages/monitor.scss %%WWWDIR%%/app/assets/stylesheets/pages/note_form.scss %%WWWDIR%%/app/assets/stylesheets/pages/notes.scss %%WWWDIR%%/app/assets/stylesheets/pages/notifications.scss @@ -3424,6 +3479,7 @@ %%WWWDIR%%/app/assets/stylesheets/print.scss %%WWWDIR%%/app/assets/stylesheets/snippets.scss %%WWWDIR%%/app/assets/stylesheets/test.scss +%%WWWDIR%%/app/assets/stylesheets/utilities.scss %%WWWDIR%%/app/controllers/abuse_reports_controller.rb %%WWWDIR%%/app/controllers/admin/abuse_reports_controller.rb %%WWWDIR%%/app/controllers/admin/appearances_controller.rb @@ -3466,6 +3522,7 @@ %%WWWDIR%%/app/controllers/clusters/clusters_controller.rb %%WWWDIR%%/app/controllers/concerns/accepts_pending_invitations.rb %%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb +%%WWWDIR%%/app/controllers/concerns/boards_actions.rb %%WWWDIR%%/app/controllers/concerns/boards_responses.rb %%WWWDIR%%/app/controllers/concerns/checks_collaboration.rb %%WWWDIR%%/app/controllers/concerns/continue_params.rb @@ -3606,6 +3663,7 @@ %%WWWDIR%%/app/controllers/projects/deploy_tokens_controller.rb %%WWWDIR%%/app/controllers/projects/deployments_controller.rb %%WWWDIR%%/app/controllers/projects/discussions_controller.rb +%%WWWDIR%%/app/controllers/projects/environments/prometheus_api_controller.rb %%WWWDIR%%/app/controllers/projects/environments_controller.rb %%WWWDIR%%/app/controllers/projects/error_tracking_controller.rb %%WWWDIR%%/app/controllers/projects/find_file_controller.rb @@ -3766,6 +3824,7 @@ %%WWWDIR%%/app/graphql/types/base_object.rb %%WWWDIR%%/app/graphql/types/base_scalar.rb %%WWWDIR%%/app/graphql/types/base_union.rb +%%WWWDIR%%/app/graphql/types/ci/detailed_status_type.rb %%WWWDIR%%/app/graphql/types/ci/pipeline_status_enum.rb %%WWWDIR%%/app/graphql/types/ci/pipeline_type.rb %%WWWDIR%%/app/graphql/types/issuable_state_enum.rb @@ -3916,6 +3975,7 @@ %%WWWDIR%%/app/models/application_record.rb %%WWWDIR%%/app/models/application_setting.rb %%WWWDIR%%/app/models/application_setting/term.rb +%%WWWDIR%%/app/models/application_setting_implementation.rb %%WWWDIR%%/app/models/audit_event.rb %%WWWDIR%%/app/models/award_emoji.rb %%WWWDIR%%/app/models/badge.rb @@ -4059,6 +4119,7 @@ %%WWWDIR%%/app/models/concerns/iid_routes.rb %%WWWDIR%%/app/models/concerns/importable.rb %%WWWDIR%%/app/models/concerns/issuable.rb +%%WWWDIR%%/app/models/concerns/issuable_states.rb %%WWWDIR%%/app/models/concerns/label_eventable.rb %%WWWDIR%%/app/models/concerns/loaded_in_group_list.rb %%WWWDIR%%/app/models/concerns/manual_inverse_association.rb @@ -4197,6 +4258,7 @@ %%WWWDIR%%/app/models/members_preloader.rb %%WWWDIR%%/app/models/merge_request.rb %%WWWDIR%%/app/models/merge_request/metrics.rb +%%WWWDIR%%/app/models/merge_request_assignee.rb %%WWWDIR%%/app/models/merge_request_diff.rb %%WWWDIR%%/app/models/merge_request_diff_commit.rb %%WWWDIR%%/app/models/merge_request_diff_file.rb @@ -4257,6 +4319,7 @@ %%WWWDIR%%/app/models/project_services/flowdock_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 %%WWWDIR%%/app/models/project_services/irker_service.rb %%WWWDIR%%/app/models/project_services/issue_tracker_service.rb %%WWWDIR%%/app/models/project_services/jira_service.rb @@ -4305,6 +4368,7 @@ %%WWWDIR%%/app/models/route.rb %%WWWDIR%%/app/models/security_event.rb %%WWWDIR%%/app/models/sent_notification.rb +%%WWWDIR%%/app/models/serverless/function.rb %%WWWDIR%%/app/models/service.rb %%WWWDIR%%/app/models/shard.rb %%WWWDIR%%/app/models/snippet.rb @@ -4361,6 +4425,7 @@ %%WWWDIR%%/app/policies/group_label_policy.rb %%WWWDIR%%/app/policies/group_member_policy.rb %%WWWDIR%%/app/policies/group_policy.rb +%%WWWDIR%%/app/policies/identity_provider_policy.rb %%WWWDIR%%/app/policies/issuable_policy.rb %%WWWDIR%%/app/policies/issue_policy.rb %%WWWDIR%%/app/policies/merge_request_policy.rb @@ -4381,6 +4446,7 @@ %%WWWDIR%%/app/presenters/README.md %%WWWDIR%%/app/presenters/blob_presenter.rb %%WWWDIR%%/app/presenters/blobs/unfold_presenter.rb +%%WWWDIR%%/app/presenters/ci/bridge_presenter.rb %%WWWDIR%%/app/presenters/ci/build_metadata_presenter.rb %%WWWDIR%%/app/presenters/ci/build_presenter.rb %%WWWDIR%%/app/presenters/ci/build_runner_presenter.rb @@ -4531,6 +4597,7 @@ %%WWWDIR%%/app/serializers/stage_serializer.rb %%WWWDIR%%/app/serializers/submodule_entity.rb %%WWWDIR%%/app/serializers/suggestion_entity.rb +%%WWWDIR%%/app/serializers/suggestion_serializer.rb %%WWWDIR%%/app/serializers/test_case_entity.rb %%WWWDIR%%/app/serializers/test_reports_comparer_entity.rb %%WWWDIR%%/app/serializers/test_reports_comparer_serializer.rb @@ -4583,6 +4650,7 @@ %%WWWDIR%%/app/services/ci/extract_sections_from_build_trace_service.rb %%WWWDIR%%/app/services/ci/pipeline_trigger_service.rb %%WWWDIR%%/app/services/ci/play_build_service.rb +%%WWWDIR%%/app/services/ci/prepare_build_service.rb %%WWWDIR%%/app/services/ci/process_build_service.rb %%WWWDIR%%/app/services/ci/process_pipeline_service.rb %%WWWDIR%%/app/services/ci/register_job_service.rb @@ -4623,9 +4691,11 @@ %%WWWDIR%%/app/services/compare_service.rb %%WWWDIR%%/app/services/concerns/exclusive_lease_guard.rb %%WWWDIR%%/app/services/concerns/issues/resolve_discussions.rb +%%WWWDIR%%/app/services/concerns/suggestible.rb %%WWWDIR%%/app/services/concerns/update_visibility_level.rb %%WWWDIR%%/app/services/concerns/users/new_user_notifier.rb %%WWWDIR%%/app/services/concerns/users/participable_service.rb +%%WWWDIR%%/app/services/concerns/validates_classification_label.rb %%WWWDIR%%/app/services/create_branch_service.rb %%WWWDIR%%/app/services/create_snippet_service.rb %%WWWDIR%%/app/services/delete_branch_service.rb @@ -4649,10 +4719,11 @@ %%WWWDIR%%/app/services/files/delete_service.rb %%WWWDIR%%/app/services/files/multi_service.rb %%WWWDIR%%/app/services/files/update_service.rb -%%WWWDIR%%/app/services/git_push_service.rb -%%WWWDIR%%/app/services/git_tag_push_service.rb +%%WWWDIR%%/app/services/git/branch_push_service.rb +%%WWWDIR%%/app/services/git/tag_push_service.rb %%WWWDIR%%/app/services/gpg_keys/create_service.rb %%WWWDIR%%/app/services/gravatar_service.rb +%%WWWDIR%%/app/services/groups/auto_devops_service.rb %%WWWDIR%%/app/services/groups/base_service.rb %%WWWDIR%%/app/services/groups/create_service.rb %%WWWDIR%%/app/services/groups/destroy_service.rb @@ -4721,7 +4792,9 @@ %%WWWDIR%%/app/services/merge_requests/merge_service.rb %%WWWDIR%%/app/services/merge_requests/merge_to_ref_service.rb %%WWWDIR%%/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb +%%WWWDIR%%/app/services/merge_requests/migrate_external_diffs_service.rb %%WWWDIR%%/app/services/merge_requests/post_merge_service.rb +%%WWWDIR%%/app/services/merge_requests/push_options_handler_service.rb %%WWWDIR%%/app/services/merge_requests/rebase_service.rb %%WWWDIR%%/app/services/merge_requests/refresh_service.rb %%WWWDIR%%/app/services/merge_requests/reload_diffs_service.rb @@ -4817,6 +4890,7 @@ %%WWWDIR%%/app/services/projects/update_remote_mirror_service.rb %%WWWDIR%%/app/services/projects/update_service.rb %%WWWDIR%%/app/services/prometheus/adapter_service.rb +%%WWWDIR%%/app/services/prometheus/proxy_service.rb %%WWWDIR%%/app/services/protected_branches/access_level_params.rb %%WWWDIR%%/app/services/protected_branches/api_service.rb %%WWWDIR%%/app/services/protected_branches/create_service.rb @@ -4850,6 +4924,7 @@ %%WWWDIR%%/app/services/submodules/update_service.rb %%WWWDIR%%/app/services/suggestions/apply_service.rb %%WWWDIR%%/app/services/suggestions/create_service.rb +%%WWWDIR%%/app/services/suggestions/outdate_service.rb %%WWWDIR%%/app/services/system_hooks_service.rb %%WWWDIR%%/app/services/system_note_service.rb %%WWWDIR%%/app/services/tags/create_service.rb @@ -4915,8 +4990,8 @@ %%WWWDIR%%/app/validators/color_validator.rb %%WWWDIR%%/app/validators/cron_timezone_validator.rb %%WWWDIR%%/app/validators/cron_validator.rb +%%WWWDIR%%/app/validators/devise_email_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 @@ -4928,6 +5003,7 @@ %%WWWDIR%%/app/validators/top_level_group_validator.rb %%WWWDIR%%/app/validators/url_validator.rb %%WWWDIR%%/app/validators/variable_duplicates_validator.rb +%%WWWDIR%%/app/validators/x509_certificate_credentials_validator.rb %%WWWDIR%%/app/views/abuse_report_mailer/notify.html.haml %%WWWDIR%%/app/views/abuse_report_mailer/notify.text.haml %%WWWDIR%%/app/views/abuse_reports/new.html.haml @@ -4942,6 +5018,7 @@ %%WWWDIR%%/app/views/admin/application_settings/_ci_cd.html.haml %%WWWDIR%%/app/views/admin/application_settings/_diff_limits.html.haml %%WWWDIR%%/app/views/admin/application_settings/_email.html.haml +%%WWWDIR%%/app/views/admin/application_settings/_external_authorization_service_form.html.haml %%WWWDIR%%/app/views/admin/application_settings/_gitaly.html.haml %%WWWDIR%%/app/views/admin/application_settings/_help_page.html.haml %%WWWDIR%%/app/views/admin/application_settings/_influx.html.haml @@ -5227,8 +5304,10 @@ %%WWWDIR%%/app/views/groups/settings/_general.html.haml %%WWWDIR%%/app/views/groups/settings/_lfs.html.haml %%WWWDIR%%/app/views/groups/settings/_permissions.html.haml +%%WWWDIR%%/app/views/groups/settings/_project_creation_level.html.haml %%WWWDIR%%/app/views/groups/settings/_two_factor_auth.html.haml %%WWWDIR%%/app/views/groups/settings/badges/index.html.haml +%%WWWDIR%%/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml %%WWWDIR%%/app/views/groups/settings/ci_cd/show.html.haml %%WWWDIR%%/app/views/groups/show.atom.builder %%WWWDIR%%/app/views/groups/show.html.haml @@ -5319,6 +5398,7 @@ %%WWWDIR%%/app/views/layouts/mailer.text.erb %%WWWDIR%%/app/views/layouts/mailer/devise.html.haml %%WWWDIR%%/app/views/layouts/nav/_breadcrumbs.html.haml +%%WWWDIR%%/app/views/layouts/nav/_classification_level_banner.html.haml %%WWWDIR%%/app/views/layouts/nav/_dashboard.html.haml %%WWWDIR%%/app/views/layouts/nav/_explore.html.haml %%WWWDIR%%/app/views/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml @@ -5450,7 +5530,9 @@ %%WWWDIR%%/app/views/peek/views/_gc.html.haml %%WWWDIR%%/app/views/peek/views/_redis.html.haml %%WWWDIR%%/app/views/peek/views/_sidekiq.html.haml +%%WWWDIR%%/app/views/profiles/_email_settings.html.haml %%WWWDIR%%/app/views/profiles/_event_table.html.haml +%%WWWDIR%%/app/views/profiles/accounts/_providers.html.haml %%WWWDIR%%/app/views/profiles/accounts/show.html.haml %%WWWDIR%%/app/views/profiles/active_sessions/_active_session.html.haml %%WWWDIR%%/app/views/profiles/active_sessions/index.html.haml @@ -5469,6 +5551,7 @@ %%WWWDIR%%/app/views/profiles/keys/_key_table.html.haml %%WWWDIR%%/app/views/profiles/keys/index.html.haml %%WWWDIR%%/app/views/profiles/keys/show.html.haml +%%WWWDIR%%/app/views/profiles/notifications/_email_settings.html.haml %%WWWDIR%%/app/views/profiles/notifications/_group_settings.html.haml %%WWWDIR%%/app/views/profiles/notifications/_project_settings.html.haml %%WWWDIR%%/app/views/profiles/notifications/show.html.haml @@ -5484,6 +5567,7 @@ %%WWWDIR%%/app/views/profiles/two_factor_auths/show.html.haml %%WWWDIR%%/app/views/projects/_activity.html.haml %%WWWDIR%%/app/views/projects/_bitbucket_import_modal.html.haml +%%WWWDIR%%/app/views/projects/_classification_policy_settings.html.haml %%WWWDIR%%/app/views/projects/_commit_button.html.haml %%WWWDIR%%/app/views/projects/_customize_workflow.html.haml %%WWWDIR%%/app/views/projects/_deletion_failed.html.haml @@ -5681,12 +5765,10 @@ %%WWWDIR%%/app/views/projects/imports/new.html.haml %%WWWDIR%%/app/views/projects/imports/show.html.haml %%WWWDIR%%/app/views/projects/issues/_by_email_description.html.haml -%%WWWDIR%%/app/views/projects/issues/_closed_by_box.html.haml %%WWWDIR%%/app/views/projects/issues/_discussion.html.haml %%WWWDIR%%/app/views/projects/issues/_form.html.haml %%WWWDIR%%/app/views/projects/issues/_issue.html.haml %%WWWDIR%%/app/views/projects/issues/_issues.html.haml -%%WWWDIR%%/app/views/projects/issues/_merge_requests.html.haml %%WWWDIR%%/app/views/projects/issues/_merge_requests_status.html.haml %%WWWDIR%%/app/views/projects/issues/_nav_btns.html.haml %%WWWDIR%%/app/views/projects/issues/_new_branch.html.haml @@ -5930,13 +6012,14 @@ %%WWWDIR%%/app/views/search/results/_note.html.haml %%WWWDIR%%/app/views/search/results/_snippet_blob.html.haml %%WWWDIR%%/app/views/search/results/_snippet_title.html.haml +%%WWWDIR%%/app/views/search/results/_user.html.haml %%WWWDIR%%/app/views/search/results/_wiki_blob.html.haml %%WWWDIR%%/app/views/search/show.html.haml %%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/_choose_avatar_button.html.haml %%WWWDIR%%/app/views/shared/_clone_panel.html.haml %%WWWDIR%%/app/views/shared/_commit_message_container.html.haml %%WWWDIR%%/app/views/shared/_commit_well.html.haml @@ -6277,6 +6360,7 @@ %%WWWDIR%%/app/workers/build_trace_sections_worker.rb %%WWWDIR%%/app/workers/chat_notification_worker.rb %%WWWDIR%%/app/workers/ci/archive_traces_cron_worker.rb +%%WWWDIR%%/app/workers/ci/build_prepare_worker.rb %%WWWDIR%%/app/workers/ci/build_schedule_worker.rb %%WWWDIR%%/app/workers/ci/build_trace_chunk_flush_worker.rb %%WWWDIR%%/app/workers/cleanup_container_repository_worker.rb @@ -6358,6 +6442,7 @@ %%WWWDIR%%/app/workers/mail_scheduler/issue_due_worker.rb %%WWWDIR%%/app/workers/mail_scheduler/notification_service_worker.rb %%WWWDIR%%/app/workers/merge_worker.rb +%%WWWDIR%%/app/workers/migrate_external_diffs_worker.rb %%WWWDIR%%/app/workers/namespaceless_project_destroy_worker.rb %%WWWDIR%%/app/workers/new_issue_worker.rb %%WWWDIR%%/app/workers/new_merge_request_worker.rb @@ -6407,6 +6492,7 @@ %%WWWDIR%%/app/workers/repository_update_remote_mirror_worker.rb %%WWWDIR%%/app/workers/requests_profiles_worker.rb %%WWWDIR%%/app/workers/run_pipeline_schedule_worker.rb +%%WWWDIR%%/app/workers/schedule_migrate_external_diffs_worker.rb %%WWWDIR%%/app/workers/stage_update_worker.rb %%WWWDIR%%/app/workers/stuck_ci_jobs_worker.rb %%WWWDIR%%/app/workers/stuck_import_jobs_worker.rb @@ -6458,6 +6544,7 @@ %%WWWDIR%%/config/environments/development.rb %%WWWDIR%%/config/environments/production.rb %%WWWDIR%%/config/environments/test.rb +%%WWWDIR%%/config/helpers/is_ee_env.js %%WWWDIR%%/config/initializers/01_secret_token.rb %%WWWDIR%%/config/initializers/0_acts_as_taggable.rb %%WWWDIR%%/config/initializers/0_as_concern.rb @@ -6519,6 +6606,8 @@ %%WWWDIR%%/config/initializers/grpc.rb %%WWWDIR%%/config/initializers/hamlit.rb %%WWWDIR%%/config/initializers/health_check.rb +%%WWWDIR%%/config/initializers/hipchat_client_patch.rb +%%WWWDIR%%/config/initializers/jira.rb %%WWWDIR%%/config/initializers/kaminari_active_record_relation_methods_with_limit.rb %%WWWDIR%%/config/initializers/kaminari_config.rb %%WWWDIR%%/config/initializers/lograge.rb @@ -6618,18 +6707,20 @@ %%WWWDIR%%/danger/eslint/Dangerfile %%WWWDIR%%/danger/frozen_string/Dangerfile %%WWWDIR%%/danger/gemfile/Dangerfile +%%WWWDIR%%/danger/gitlab_ui_wg/Dangerfile %%WWWDIR%%/danger/metadata/Dangerfile %%WWWDIR%%/danger/plugins/helper.rb %%WWWDIR%%/danger/prettier/Dangerfile %%WWWDIR%%/danger/roulette/Dangerfile +%%WWWDIR%%/danger/single_codebase/Dangerfile %%WWWDIR%%/danger/specs/Dangerfile %%WWWDIR%%/db/fixtures/development/01_admin.rb -%%WWWDIR%%/db/fixtures/development/03_settings.rb -%%WWWDIR%%/db/fixtures/development/04_project.rb +%%WWWDIR%%/db/fixtures/development/02_application_settings.rb +%%WWWDIR%%/db/fixtures/development/03_project.rb +%%WWWDIR%%/db/fixtures/development/04_labels.rb %%WWWDIR%%/db/fixtures/development/05_users.rb %%WWWDIR%%/db/fixtures/development/06_teams.rb %%WWWDIR%%/db/fixtures/development/07_milestones.rb -%%WWWDIR%%/db/fixtures/development/08_settings.rb %%WWWDIR%%/db/fixtures/development/09_issues.rb %%WWWDIR%%/db/fixtures/development/10_merge_requests.rb %%WWWDIR%%/db/fixtures/development/11_keys.rb @@ -6643,9 +6734,9 @@ %%WWWDIR%%/db/fixtures/development/19_environments.rb %%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/24_forks.rb +%%WWWDIR%%/db/fixtures/development/25_api_personal_access_token.rb %%WWWDIR%%/db/fixtures/development/99_common_metrics.rb %%WWWDIR%%/db/fixtures/production/001_application_settings.rb %%WWWDIR%%/db/fixtures/production/002_admin.rb @@ -7351,12 +7442,14 @@ %%WWWDIR%%/db/migrate/20171204204233_add_permanent_to_redirect_route.rb %%WWWDIR%%/db/migrate/20171206221519_add_permanent_index_to_redirect_route.rb %%WWWDIR%%/db/migrate/20171207185153_add_merge_request_state_index.rb +%%WWWDIR%%/db/migrate/20171211131502_add_external_classification_authorization_settings_to_appliction_settings.rb %%WWWDIR%%/db/migrate/20171211145425_add_can_push_to_deploy_keys_projects.rb %%WWWDIR%%/db/migrate/20171212203433_create_clusters_applications_prometheus.rb %%WWWDIR%%/db/migrate/20171214144320_add_store_column_to_uploads.rb %%WWWDIR%%/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb %%WWWDIR%%/db/migrate/20171216111734_clean_up_for_members.rb %%WWWDIR%%/db/migrate/20171216112339_add_foreign_key_for_members.rb +%%WWWDIR%%/db/migrate/20171218140451_add_external_authorization_service_classification_label_to_projects.rb %%WWWDIR%%/db/migrate/20171220191323_add_index_on_namespaces_lower_name.rb %%WWWDIR%%/db/migrate/20171222115326_add_confidential_note_events_to_web_hooks.rb %%WWWDIR%%/db/migrate/20171222183504_add_jobs_cache_index_to_project.rb @@ -7411,7 +7504,9 @@ %%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/20180314100728_add_external_authorization_service_timeout_to_application_settings.rb %%WWWDIR%%/db/migrate/20180314145917_add_header_and_footer_banners_to_appearances_table.rb +%%WWWDIR%%/db/migrate/20180315160435_add_external_auth_mutual_tls_fields_to_project_settings.rb %%WWWDIR%%/db/migrate/20180319190020_create_deploy_tokens.rb %%WWWDIR%%/db/migrate/20180320182229_add_indexes_for_user_activity_queries.rb %%WWWDIR%%/db/migrate/20180323150945_add_push_to_merge_request_to_notification_settings.rb @@ -7578,7 +7673,6 @@ %%WWWDIR%%/db/migrate/20190103140724_make_legacy_false_default.rb %%WWWDIR%%/db/migrate/20190104182041_cleanup_legacy_artifact_migration.rb %%WWWDIR%%/db/migrate/20190107151020_add_services_type_index.rb -%%WWWDIR%%/db/migrate/20190107151029_remove_hipchat_services.rb %%WWWDIR%%/db/migrate/20190108192941_remove_partial_index_from_ci_builds_artifacts_file.rb %%WWWDIR%%/db/migrate/20190109153125_add_merge_request_external_diffs.rb %%WWWDIR%%/db/migrate/20190114172110_add_domain_to_cluster.rb @@ -7587,15 +7681,25 @@ %%WWWDIR%%/db/migrate/20190116234221_add_sorting_fields_to_user_preference.rb %%WWWDIR%%/db/migrate/20190130091630_add_local_cached_markdown_version.rb %%WWWDIR%%/db/migrate/20190206193120_add_index_to_tags.rb +%%WWWDIR%%/db/migrate/20190211131150_add_state_id_to_issuables.rb %%WWWDIR%%/db/migrate/20190215154930_add_merge_pipelines_enabled_to_ci_cd_settings.rb %%WWWDIR%%/db/migrate/20190218134158_add_masked_to_ci_variables.rb %%WWWDIR%%/db/migrate/20190218134209_add_masked_to_ci_group_variables.rb %%WWWDIR%%/db/migrate/20190220142344_add_email_header_and_footer_enabled_flag_to_appearances_table.rb %%WWWDIR%%/db/migrate/20190220150130_add_extra_shas_to_ci_pipelines.rb +%%WWWDIR%%/db/migrate/20190222051615_add_indexes_for_merge_request_diffs_query.rb +%%WWWDIR%%/db/migrate/20190225152525_add_auto_dev_ops_enabled_to_namespaces.rb %%WWWDIR%%/db/migrate/20190225160300_steal_encrypt_runners_tokens.rb %%WWWDIR%%/db/migrate/20190225160301_add_runner_tokens_indexes.rb +%%WWWDIR%%/db/migrate/20190228192410_add_multi_line_attributes_to_suggestion.rb %%WWWDIR%%/db/migrate/20190301182457_add_external_hostname_to_ingress_and_knative.rb +%%WWWDIR%%/db/migrate/20190311132500_add_default_project_creation_application_setting.rb +%%WWWDIR%%/db/migrate/20190311132527_add_project_creation_level_to_namespaces.rb %%WWWDIR%%/db/migrate/20190312071108_add_detected_repository_languages_to_projects.rb +%%WWWDIR%%/db/migrate/20190315191339_create_merge_request_assignees_table.rb +%%WWWDIR%%/db/migrate/20190325080727_truncate_user_fullname.rb +%%WWWDIR%%/db/migrate/20190325165127_add_managed_to_cluster.rb +%%WWWDIR%%/db/migrate/20190326164045_import_common_metrics_knative.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 @@ -7789,19 +7893,27 @@ %%WWWDIR%%/db/post_migrate/20190124200344_migrate_storage_migrator_sidekiq_queue.rb %%WWWDIR%%/db/post_migrate/20190131122559_fix_null_type_labels.rb %%WWWDIR%%/db/post_migrate/20190204115450_migrate_auto_dev_ops_domain_to_cluster_domain.rb +%%WWWDIR%%/db/post_migrate/20190214112022_schedule_sync_issuables_state_id.rb %%WWWDIR%%/db/post_migrate/20190301081611_migrate_project_migrate_sidekiq_queue.rb +%%WWWDIR%%/db/post_migrate/20190313092516_clean_up_noteable_id_for_notes_on_commits.rb +%%WWWDIR%%/db/post_migrate/20190322132835_schedule_populate_merge_request_assignees_table.rb +%%WWWDIR%%/db/post_migrate/20190325111602_rename_v2_root_namespaces.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md %%WWWDIR%%/doc/administration/auth/README.md %%WWWDIR%%/doc/administration/auth/authentiq.md %%WWWDIR%%/doc/administration/auth/crowd.md +%%WWWDIR%%/doc/administration/auth/google_secure_ldap.md %%WWWDIR%%/doc/administration/auth/how_to_configure_ldap_gitlab_ce/img/gitlab_ou.png %%WWWDIR%%/doc/administration/auth/how_to_configure_ldap_gitlab_ce/img/ldap_ou.gif %%WWWDIR%%/doc/administration/auth/how_to_configure_ldap_gitlab_ce/img/user_auth.gif %%WWWDIR%%/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md %%WWWDIR%%/doc/administration/auth/img/crowd_application.png %%WWWDIR%%/doc/administration/auth/img/crowd_application_authorisation.png +%%WWWDIR%%/doc/administration/auth/img/google_secure_ldap_add_step_1.png +%%WWWDIR%%/doc/administration/auth/img/google_secure_ldap_add_step_2.png +%%WWWDIR%%/doc/administration/auth/img/google_secure_ldap_client_settings.png %%WWWDIR%%/doc/administration/auth/img/okta_admin_panel.png %%WWWDIR%%/doc/administration/auth/img/okta_saml_settings.png %%WWWDIR%%/doc/administration/auth/jwt.md @@ -7904,6 +8016,7 @@ %%WWWDIR%%/doc/administration/troubleshooting/gdb-stuck-ruby.txt %%WWWDIR%%/doc/administration/troubleshooting/sidekiq.md %%WWWDIR%%/doc/administration/uploads.md +%%WWWDIR%%/doc/administration/user_settings.md %%WWWDIR%%/doc/api/README.md %%WWWDIR%%/doc/api/access_requests.md %%WWWDIR%%/doc/api/applications.md @@ -8007,6 +8120,7 @@ %%WWWDIR%%/doc/ci/docker/using_kaniko.md %%WWWDIR%%/doc/ci/enable_or_disable_ci.md %%WWWDIR%%/doc/ci/environments.md +%%WWWDIR%%/doc/ci/environments/protected_environments.md %%WWWDIR%%/doc/ci/examples/README.md %%WWWDIR%%/doc/ci/examples/artifactory_and_gitlab/index.md %%WWWDIR%%/doc/ci/examples/browser_performance.md @@ -8071,24 +8185,26 @@ %%WWWDIR%%/doc/ci/img/job_failure_reason.png %%WWWDIR%%/doc/ci/img/junit_test_report.png %%WWWDIR%%/doc/ci/img/pipeline_incremental_rollout.png -%%WWWDIR%%/doc/ci/img/pipelines-goal.png %%WWWDIR%%/doc/ci/img/pipelines.png %%WWWDIR%%/doc/ci/img/pipelines_grouped.png %%WWWDIR%%/doc/ci/img/pipelines_index.png %%WWWDIR%%/doc/ci/img/pipelines_mini_graph.png %%WWWDIR%%/doc/ci/img/pipelines_mini_graph_simple.png %%WWWDIR%%/doc/ci/img/pipelines_mini_graph_sorting.png -%%WWWDIR%%/doc/ci/img/types-of-pipelines.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/introduction/img/gitlab_workflow_example_11_9.png %%WWWDIR%%/doc/ci/introduction/img/job_running.png %%WWWDIR%%/doc/ci/introduction/img/pipeline_status.png %%WWWDIR%%/doc/ci/introduction/img/rollback.png %%WWWDIR%%/doc/ci/introduction/index.md %%WWWDIR%%/doc/ci/junit_test_reports.md +%%WWWDIR%%/doc/ci/large_repositories/index.md %%WWWDIR%%/doc/ci/merge_request_pipelines/img/merge_request.png +%%WWWDIR%%/doc/ci/merge_request_pipelines/img/merge_request_pipeline.png +%%WWWDIR%%/doc/ci/merge_request_pipelines/img/merge_request_pipeline_config.png %%WWWDIR%%/doc/ci/merge_request_pipelines/img/pipeline_detail.png %%WWWDIR%%/doc/ci/merge_request_pipelines/index.md %%WWWDIR%%/doc/ci/permissions/README.md @@ -8124,6 +8240,13 @@ %%WWWDIR%%/doc/ci/triggers/img/trigger_variables.png %%WWWDIR%%/doc/ci/triggers/img/triggers_page.png %%WWWDIR%%/doc/ci/variables/README.md +%%WWWDIR%%/doc/ci/variables/deprecated_variables.md +%%WWWDIR%%/doc/ci/variables/img/ci_job_stage_output_example.png +%%WWWDIR%%/doc/ci/variables/img/custom_variable_output.png +%%WWWDIR%%/doc/ci/variables/img/new_custom_variable_example.png +%%WWWDIR%%/doc/ci/variables/img/override_value_via_manual_pipeline_output.png +%%WWWDIR%%/doc/ci/variables/img/override_variable_manual_pipeline.png +%%WWWDIR%%/doc/ci/variables/predefined_variables.md %%WWWDIR%%/doc/ci/variables/where_variables_can_be_used.md %%WWWDIR%%/doc/ci/yaml/README.md %%WWWDIR%%/doc/container_registry/README.md @@ -8201,12 +8324,14 @@ %%WWWDIR%%/doc/development/fe_guide/droplab/plugins/filter.md %%WWWDIR%%/doc/development/fe_guide/droplab/plugins/input_setter.md %%WWWDIR%%/doc/development/fe_guide/emojis.md +%%WWWDIR%%/doc/development/fe_guide/event_tracking.md %%WWWDIR%%/doc/development/fe_guide/graphql.md %%WWWDIR%%/doc/development/fe_guide/icons.md %%WWWDIR%%/doc/development/fe_guide/img/boards_diagram.png %%WWWDIR%%/doc/development/fe_guide/img/gl-modal.png %%WWWDIR%%/doc/development/fe_guide/index.md %%WWWDIR%%/doc/development/fe_guide/performance.md +%%WWWDIR%%/doc/development/fe_guide/principles.md %%WWWDIR%%/doc/development/fe_guide/security.md %%WWWDIR%%/doc/development/fe_guide/style_guide_js.md %%WWWDIR%%/doc/development/fe_guide/style_guide_scss.md @@ -8218,6 +8343,7 @@ %%WWWDIR%%/doc/development/foreign_keys.md %%WWWDIR%%/doc/development/frontend.md %%WWWDIR%%/doc/development/gemfile.md +%%WWWDIR%%/doc/development/git_object_deduplication.md %%WWWDIR%%/doc/development/gitaly.md %%WWWDIR%%/doc/development/github_importer.md %%WWWDIR%%/doc/development/gitlab_architecture_diagram.png @@ -8250,18 +8376,12 @@ %%WWWDIR%%/doc/development/new_fe_guide/dependencies.md %%WWWDIR%%/doc/development/new_fe_guide/development/accessibility.md %%WWWDIR%%/doc/development/new_fe_guide/development/components.md -%%WWWDIR%%/doc/development/new_fe_guide/development/design_patterns.md %%WWWDIR%%/doc/development/new_fe_guide/development/index.md -%%WWWDIR%%/doc/development/new_fe_guide/development/network_requests.md %%WWWDIR%%/doc/development/new_fe_guide/development/performance.md -%%WWWDIR%%/doc/development/new_fe_guide/development/security.md %%WWWDIR%%/doc/development/new_fe_guide/development/testing.md -%%WWWDIR%%/doc/development/new_fe_guide/event_tracking.md %%WWWDIR%%/doc/development/new_fe_guide/index.md -%%WWWDIR%%/doc/development/new_fe_guide/initiatives.md %%WWWDIR%%/doc/development/new_fe_guide/modules/dirty_submit.md %%WWWDIR%%/doc/development/new_fe_guide/modules/index.md -%%WWWDIR%%/doc/development/new_fe_guide/principles.md %%WWWDIR%%/doc/development/new_fe_guide/style/html.md %%WWWDIR%%/doc/development/new_fe_guide/style/index.md %%WWWDIR%%/doc/development/new_fe_guide/style/javascript.md @@ -8281,6 +8401,7 @@ %%WWWDIR%%/doc/development/profiling.md %%WWWDIR%%/doc/development/prometheus_metrics.md %%WWWDIR%%/doc/development/pry_debugging.md +%%WWWDIR%%/doc/development/python_guide/index.md %%WWWDIR%%/doc/development/query_count_limits.md %%WWWDIR%%/doc/development/query_recorder.md %%WWWDIR%%/doc/development/rake_tasks.md @@ -8301,6 +8422,7 @@ %%WWWDIR%%/doc/development/testing_guide/end_to_end_tests.md %%WWWDIR%%/doc/development/testing_guide/flaky_tests.md %%WWWDIR%%/doc/development/testing_guide/frontend_testing.md +%%WWWDIR%%/doc/development/testing_guide/img/qa_on_merge_requests_cicd_architecture.png %%WWWDIR%%/doc/development/testing_guide/img/review_apps_cicd_architecture.png %%WWWDIR%%/doc/development/testing_guide/img/testing_triangle.png %%WWWDIR%%/doc/development/testing_guide/index.md @@ -8458,11 +8580,7 @@ %%WWWDIR%%/doc/gitlab-basics/img/merge_request_select_branch.png %%WWWDIR%%/doc/gitlab-basics/img/new_issue_button.png %%WWWDIR%%/doc/gitlab-basics/img/new_issue_page.png -%%WWWDIR%%/doc/gitlab-basics/img/profile_settings.png -%%WWWDIR%%/doc/gitlab-basics/img/profile_settings_ssh_keys.png -%%WWWDIR%%/doc/gitlab-basics/img/profile_settings_ssh_keys_paste_pub.png %%WWWDIR%%/doc/gitlab-basics/img/profile_settings_ssh_keys_single_key.png -%%WWWDIR%%/doc/gitlab-basics/img/profile_settings_ssh_keys_title.png %%WWWDIR%%/doc/gitlab-basics/img/project_clone_url.png %%WWWDIR%%/doc/gitlab-basics/img/public_file_link.png %%WWWDIR%%/doc/gitlab-basics/start-using-git.md @@ -8647,6 +8765,7 @@ %%WWWDIR%%/doc/project_services/bamboo.md %%WWWDIR%%/doc/project_services/bugzilla.md %%WWWDIR%%/doc/project_services/emails_on_push.md +%%WWWDIR%%/doc/project_services/hipchat.md %%WWWDIR%%/doc/project_services/irker.md %%WWWDIR%%/doc/project_services/jira.md %%WWWDIR%%/doc/project_services/kubernetes.md @@ -8919,6 +9038,8 @@ %%WWWDIR%%/doc/user/discussions/img/lock_form_non_member.png %%WWWDIR%%/doc/user/discussions/img/make_suggestion.png %%WWWDIR%%/doc/user/discussions/img/merge_request_commits_tab.png +%%WWWDIR%%/doc/user/discussions/img/multi-line-suggestion-preview.png +%%WWWDIR%%/doc/user/discussions/img/multi-line-suggestion-syntax.png %%WWWDIR%%/doc/user/discussions/img/new_issue_for_discussion.png %%WWWDIR%%/doc/user/discussions/img/onion_skin_view.png %%WWWDIR%%/doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved.png @@ -8993,7 +9114,6 @@ %%WWWDIR%%/doc/user/profile/account/two_factor_authentication.md %%WWWDIR%%/doc/user/profile/active_sessions.md %%WWWDIR%%/doc/user/profile/img/active_sessions_list.png -%%WWWDIR%%/doc/user/profile/img/personal_access_tokens.png %%WWWDIR%%/doc/user/profile/img/profil-preferences-navigation-theme.png %%WWWDIR%%/doc/user/profile/img/profile-preferences-syntax-themes.png %%WWWDIR%%/doc/user/profile/img/profile_settings_dropdown.png @@ -9023,6 +9143,7 @@ %%WWWDIR%%/doc/user/project/clusters/runbooks/index.md %%WWWDIR%%/doc/user/project/clusters/serverless/img/deploy-stage.png %%WWWDIR%%/doc/user/project/clusters/serverless/img/dns-entry.png +%%WWWDIR%%/doc/user/project/clusters/serverless/img/function-details-loaded.png %%WWWDIR%%/doc/user/project/clusters/serverless/img/function-execution.png %%WWWDIR%%/doc/user/project/clusters/serverless/img/install-knative.png %%WWWDIR%%/doc/user/project/clusters/serverless/img/knative-app.png @@ -9125,10 +9246,10 @@ %%WWWDIR%%/doc/user/project/integrations/discord_notifications.md %%WWWDIR%%/doc/user/project/integrations/emails_on_push.md %%WWWDIR%%/doc/user/project/integrations/hangouts_chat.md +%%WWWDIR%%/doc/user/project/integrations/hipchat.md %%WWWDIR%%/doc/user/project/integrations/img/emails_on_push_email.png %%WWWDIR%%/doc/user/project/integrations/img/emails_on_push_service.png %%WWWDIR%%/doc/user/project/integrations/img/hangouts_chat_configuration.png -%%WWWDIR%%/doc/user/project/integrations/img/issue_configuration.png %%WWWDIR%%/doc/user/project/integrations/img/jira_add_user_to_group.png %%WWWDIR%%/doc/user/project/integrations/img/jira_api_token.png %%WWWDIR%%/doc/user/project/integrations/img/jira_api_token_menu.png @@ -9306,8 +9427,6 @@ %%WWWDIR%%/doc/user/project/merge_requests/img/versions_dropdown.png %%WWWDIR%%/doc/user/project/merge_requests/img/versions_system_note.png %%WWWDIR%%/doc/user/project/merge_requests/img/wip_blocked_accept_button.png -%%WWWDIR%%/doc/user/project/merge_requests/img/wip_mark_as_wip.png -%%WWWDIR%%/doc/user/project/merge_requests/img/wip_unmark_as_wip.png %%WWWDIR%%/doc/user/project/merge_requests/index.md %%WWWDIR%%/doc/user/project/merge_requests/maintainer_access.md %%WWWDIR%%/doc/user/project/merge_requests/merge_request_discussion_resolution.md @@ -9584,9 +9703,11 @@ %%WWWDIR%%/lib/api/helpers/common_helpers.rb %%WWWDIR%%/lib/api/helpers/custom_attributes.rb %%WWWDIR%%/lib/api/helpers/custom_validators.rb +%%WWWDIR%%/lib/api/helpers/discussions_helpers.rb %%WWWDIR%%/lib/api/helpers/graphql_helpers.rb %%WWWDIR%%/lib/api/helpers/headers_helpers.rb %%WWWDIR%%/lib/api/helpers/internal_helpers.rb +%%WWWDIR%%/lib/api/helpers/issues_helpers.rb %%WWWDIR%%/lib/api/helpers/label_helpers.rb %%WWWDIR%%/lib/api/helpers/members_helpers.rb %%WWWDIR%%/lib/api/helpers/notes_helpers.rb @@ -9595,7 +9716,10 @@ %%WWWDIR%%/lib/api/helpers/project_snapshots_helpers.rb %%WWWDIR%%/lib/api/helpers/projects_helpers.rb %%WWWDIR%%/lib/api/helpers/related_resources_helpers.rb +%%WWWDIR%%/lib/api/helpers/resource_label_events_helpers.rb %%WWWDIR%%/lib/api/helpers/runner.rb +%%WWWDIR%%/lib/api/helpers/search_helpers.rb +%%WWWDIR%%/lib/api/helpers/services_helpers.rb %%WWWDIR%%/lib/api/helpers/version.rb %%WWWDIR%%/lib/api/import_github.rb %%WWWDIR%%/lib/api/internal.rb @@ -9704,6 +9828,7 @@ %%WWWDIR%%/lib/banzai/filter/merge_request_reference_filter.rb %%WWWDIR%%/lib/banzai/filter/mermaid_filter.rb %%WWWDIR%%/lib/banzai/filter/milestone_reference_filter.rb +%%WWWDIR%%/lib/banzai/filter/output_safety.rb %%WWWDIR%%/lib/banzai/filter/plantuml_filter.rb %%WWWDIR%%/lib/banzai/filter/project_reference_filter.rb %%WWWDIR%%/lib/banzai/filter/redactor_filter.rb @@ -9767,7 +9892,6 @@ %%WWWDIR%%/lib/banzai/renderer.rb %%WWWDIR%%/lib/banzai/renderer/common_mark/html.rb %%WWWDIR%%/lib/banzai/request_store_reference_cache.rb -%%WWWDIR%%/lib/banzai/suggestions_parser.rb %%WWWDIR%%/lib/bitbucket/client.rb %%WWWDIR%%/lib/bitbucket/collection.rb %%WWWDIR%%/lib/bitbucket/connection.rb @@ -9863,6 +9987,7 @@ %%WWWDIR%%/lib/gitlab/auth/unique_ips_limiter.rb %%WWWDIR%%/lib/gitlab/auth/user_access_denied_reason.rb %%WWWDIR%%/lib/gitlab/auth/user_auth_finders.rb +%%WWWDIR%%/lib/gitlab/authorized_keys.rb %%WWWDIR%%/lib/gitlab/background_migration.rb %%WWWDIR%%/lib/gitlab/background_migration/.rubocop.yml %%WWWDIR%%/lib/gitlab/background_migration/add_merge_request_diff_commits_count.rb @@ -9905,6 +10030,7 @@ %%WWWDIR%%/lib/gitlab/background_migration/populate_external_pipeline_source.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_fork_networks_range.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_import_state.rb +%%WWWDIR%%/lib/gitlab/background_migration/populate_merge_request_assignees_table.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_improved.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_merge_requests_latest_merge_request_diff_id.rb @@ -9918,6 +10044,8 @@ %%WWWDIR%%/lib/gitlab/background_migration/schedule_diff_files_deletion.rb %%WWWDIR%%/lib/gitlab/background_migration/set_confidential_note_events_on_services.rb %%WWWDIR%%/lib/gitlab/background_migration/set_confidential_note_events_on_webhooks.rb +%%WWWDIR%%/lib/gitlab/background_migration/sync_issues_state_id.rb +%%WWWDIR%%/lib/gitlab/background_migration/sync_merge_requests_state_id.rb %%WWWDIR%%/lib/gitlab/badge/base.rb %%WWWDIR%%/lib/gitlab/badge/coverage/metadata.rb %%WWWDIR%%/lib/gitlab/badge/coverage/report.rb @@ -9979,6 +10107,10 @@ %%WWWDIR%%/lib/gitlab/ci/build/policy/refs.rb %%WWWDIR%%/lib/gitlab/ci/build/policy/specification.rb %%WWWDIR%%/lib/gitlab/ci/build/policy/variables.rb +%%WWWDIR%%/lib/gitlab/ci/build/port.rb +%%WWWDIR%%/lib/gitlab/ci/build/prerequisite/base.rb +%%WWWDIR%%/lib/gitlab/ci/build/prerequisite/factory.rb +%%WWWDIR%%/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb %%WWWDIR%%/lib/gitlab/ci/build/step.rb %%WWWDIR%%/lib/gitlab/ci/charts.rb %%WWWDIR%%/lib/gitlab/ci/config.rb @@ -9997,6 +10129,8 @@ %%WWWDIR%%/lib/gitlab/ci/config/entry/key.rb %%WWWDIR%%/lib/gitlab/ci/config/entry/paths.rb %%WWWDIR%%/lib/gitlab/ci/config/entry/policy.rb +%%WWWDIR%%/lib/gitlab/ci/config/entry/port.rb +%%WWWDIR%%/lib/gitlab/ci/config/entry/ports.rb %%WWWDIR%%/lib/gitlab/ci/config/entry/reports.rb %%WWWDIR%%/lib/gitlab/ci/config/entry/retry.rb %%WWWDIR%%/lib/gitlab/ci/config/entry/script.rb @@ -10070,9 +10204,11 @@ %%WWWDIR%%/lib/gitlab/ci/status/build/factory.rb %%WWWDIR%%/lib/gitlab/ci/status/build/failed.rb %%WWWDIR%%/lib/gitlab/ci/status/build/failed_allowed.rb +%%WWWDIR%%/lib/gitlab/ci/status/build/failed_unmet_prerequisites.rb %%WWWDIR%%/lib/gitlab/ci/status/build/manual.rb %%WWWDIR%%/lib/gitlab/ci/status/build/pending.rb %%WWWDIR%%/lib/gitlab/ci/status/build/play.rb +%%WWWDIR%%/lib/gitlab/ci/status/build/preparing.rb %%WWWDIR%%/lib/gitlab/ci/status/build/retried.rb %%WWWDIR%%/lib/gitlab/ci/status/build/retryable.rb %%WWWDIR%%/lib/gitlab/ci/status/build/scheduled.rb @@ -10095,6 +10231,7 @@ %%WWWDIR%%/lib/gitlab/ci/status/pipeline/common.rb %%WWWDIR%%/lib/gitlab/ci/status/pipeline/delayed.rb %%WWWDIR%%/lib/gitlab/ci/status/pipeline/factory.rb +%%WWWDIR%%/lib/gitlab/ci/status/preparing.rb %%WWWDIR%%/lib/gitlab/ci/status/running.rb %%WWWDIR%%/lib/gitlab/ci/status/scheduled.rb %%WWWDIR%%/lib/gitlab/ci/status/skipped.rb @@ -10109,6 +10246,7 @@ %%WWWDIR%%/lib/gitlab/ci/templates/C++.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Chef.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Clojure.gitlab-ci.yml +%%WWWDIR%%/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Crystal.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Django.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Docker.gitlab-ci.yml @@ -10116,6 +10254,11 @@ %%WWWDIR%%/lib/gitlab/ci/templates/Go.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Gradle.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Grails.gitlab-ci.yml +%%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml +%%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml +%%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml +%%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +%%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Julia.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/LaTeX.gitlab-ci.yml %%WWWDIR%%/lib/gitlab/ci/templates/Laravel.gitlab-ci.yml @@ -10293,6 +10436,9 @@ %%WWWDIR%%/lib/gitlab/diff/parser.rb %%WWWDIR%%/lib/gitlab/diff/position.rb %%WWWDIR%%/lib/gitlab/diff/position_tracer.rb +%%WWWDIR%%/lib/gitlab/diff/suggestion.rb +%%WWWDIR%%/lib/gitlab/diff/suggestion_diff.rb +%%WWWDIR%%/lib/gitlab/diff/suggestions_parser.rb %%WWWDIR%%/lib/gitlab/discussions_diff/file_collection.rb %%WWWDIR%%/lib/gitlab/discussions_diff/highlight_cache.rb %%WWWDIR%%/lib/gitlab/downtime_check.rb @@ -10325,6 +10471,13 @@ %%WWWDIR%%/lib/gitlab/etag_caching/store.rb %%WWWDIR%%/lib/gitlab/exclusive_lease.rb %%WWWDIR%%/lib/gitlab/exclusive_lease_helpers.rb +%%WWWDIR%%/lib/gitlab/external_authorization.rb +%%WWWDIR%%/lib/gitlab/external_authorization/access.rb +%%WWWDIR%%/lib/gitlab/external_authorization/cache.rb +%%WWWDIR%%/lib/gitlab/external_authorization/client.rb +%%WWWDIR%%/lib/gitlab/external_authorization/config.rb +%%WWWDIR%%/lib/gitlab/external_authorization/logger.rb +%%WWWDIR%%/lib/gitlab/external_authorization/response.rb %%WWWDIR%%/lib/gitlab/fake_application_settings.rb %%WWWDIR%%/lib/gitlab/favicon.rb %%WWWDIR%%/lib/gitlab/file_detector.rb @@ -10467,6 +10620,7 @@ %%WWWDIR%%/lib/gitlab/gitlab_import/project_creator.rb %%WWWDIR%%/lib/gitlab/gl_id.rb %%WWWDIR%%/lib/gitlab/gl_repository.rb +%%WWWDIR%%/lib/gitlab/gl_repository/repo_type.rb %%WWWDIR%%/lib/gitlab/gon_helper.rb %%WWWDIR%%/lib/gitlab/google_code_import/client.rb %%WWWDIR%%/lib/gitlab/google_code_import/importer.rb @@ -10483,6 +10637,7 @@ %%WWWDIR%%/lib/gitlab/grape_logging/loggers/user_logger.rb %%WWWDIR%%/lib/gitlab/graphql.rb %%WWWDIR%%/lib/gitlab/graphql/authorize.rb +%%WWWDIR%%/lib/gitlab/graphql/authorize/authorize_field_service.rb %%WWWDIR%%/lib/gitlab/graphql/authorize/authorize_resource.rb %%WWWDIR%%/lib/gitlab/graphql/authorize/instrumentation.rb %%WWWDIR%%/lib/gitlab/graphql/connections.rb @@ -10493,8 +10648,11 @@ %%WWWDIR%%/lib/gitlab/graphql/mount_mutation.rb %%WWWDIR%%/lib/gitlab/graphql/present.rb %%WWWDIR%%/lib/gitlab/graphql/present/instrumentation.rb +%%WWWDIR%%/lib/gitlab/graphql/query_analyzers/log_query_complexity.rb +%%WWWDIR%%/lib/gitlab/graphql/tracing.rb %%WWWDIR%%/lib/gitlab/graphql/variables.rb %%WWWDIR%%/lib/gitlab/graphs/commits.rb +%%WWWDIR%%/lib/gitlab/group_search_results.rb %%WWWDIR%%/lib/gitlab/hashed_storage/migrator.rb %%WWWDIR%%/lib/gitlab/hashed_storage/rake_helper.rb %%WWWDIR%%/lib/gitlab/health_checks/base_abstract_check.rb @@ -10691,19 +10849,27 @@ %%WWWDIR%%/lib/gitlab/prometheus/queries/base_query.rb %%WWWDIR%%/lib/gitlab/prometheus/queries/deployment_query.rb %%WWWDIR%%/lib/gitlab/prometheus/queries/environment_query.rb +%%WWWDIR%%/lib/gitlab/prometheus/queries/knative_invocation_query.rb %%WWWDIR%%/lib/gitlab/prometheus/queries/matched_metric_query.rb %%WWWDIR%%/lib/gitlab/prometheus/queries/query_additional_metrics.rb %%WWWDIR%%/lib/gitlab/prometheus/query_variables.rb %%WWWDIR%%/lib/gitlab/prometheus_client.rb %%WWWDIR%%/lib/gitlab/protocol_access.rb %%WWWDIR%%/lib/gitlab/proxy_http_connection_adapter.rb +%%WWWDIR%%/lib/gitlab/push_options.rb %%WWWDIR%%/lib/gitlab/query_limiting.rb %%WWWDIR%%/lib/gitlab/query_limiting/active_support_subscriber.rb %%WWWDIR%%/lib/gitlab/query_limiting/middleware.rb %%WWWDIR%%/lib/gitlab/query_limiting/transaction.rb %%WWWDIR%%/lib/gitlab/quick_actions/command_definition.rb +%%WWWDIR%%/lib/gitlab/quick_actions/commit_actions.rb +%%WWWDIR%%/lib/gitlab/quick_actions/common_actions.rb %%WWWDIR%%/lib/gitlab/quick_actions/dsl.rb %%WWWDIR%%/lib/gitlab/quick_actions/extractor.rb +%%WWWDIR%%/lib/gitlab/quick_actions/issuable_actions.rb +%%WWWDIR%%/lib/gitlab/quick_actions/issue_actions.rb +%%WWWDIR%%/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb +%%WWWDIR%%/lib/gitlab/quick_actions/merge_request_actions.rb %%WWWDIR%%/lib/gitlab/quick_actions/spend_time_and_date_separator.rb %%WWWDIR%%/lib/gitlab/quick_actions/substitution_definition.rb %%WWWDIR%%/lib/gitlab/recaptcha.rb @@ -10836,6 +11002,7 @@ %%WWWDIR%%/lib/gitlab/uploads_transfer.rb %%WWWDIR%%/lib/gitlab/url_blocker.rb %%WWWDIR%%/lib/gitlab/url_builder.rb +%%WWWDIR%%/lib/gitlab/url_helpers.rb %%WWWDIR%%/lib/gitlab/url_sanitizer.rb %%WWWDIR%%/lib/gitlab/usage_data.rb %%WWWDIR%%/lib/gitlab/user_access.rb @@ -11021,6 +11188,8 @@ @(git,,) %%WWWDIR%%/locale/ar_SA/gitlab.po @(git,,) %%WWWDIR%%/locale/bg/gitlab.po @(git,,) %%WWWDIR%%/locale/bg/gitlab.po.time_stamp +@(git,,) %%WWWDIR%%/locale/bn_BD/gitlab.po +@(git,,) %%WWWDIR%%/locale/bn_IN/gitlab.po @(git,,) %%WWWDIR%%/locale/ca_ES/gitlab.po @(git,,) %%WWWDIR%%/locale/cs_CZ/gitlab.po @(git,,) %%WWWDIR%%/locale/cy_GB/gitlab.po @@ -11049,6 +11218,7 @@ @(git,,) %%WWWDIR%%/locale/it/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/ja/gitlab.po @(git,,) %%WWWDIR%%/locale/ja/gitlab.po.time_stamp +@(git,,) %%WWWDIR%%/locale/ka_GE/gitlab.po @(git,,) %%WWWDIR%%/locale/ko/gitlab.po @(git,,) %%WWWDIR%%/locale/ko/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/mn_MN/gitlab.po @@ -11096,8 +11266,10 @@ %%WWWDIR%%/qa/Gemfile %%WWWDIR%%/qa/README.md %%WWWDIR%%/qa/Rakefile +%%WWWDIR%%/qa/STYLE_GUIDE.md %%WWWDIR%%/qa/bin/qa %%WWWDIR%%/qa/bin/test +%%WWWDIR%%/qa/load/artillery.yml %%WWWDIR%%/qa/qa.rb %%WWWDIR%%/qa/qa/ce/strategy.rb %%WWWDIR%%/qa/qa/fixtures/auto_devops_rack/Gemfile @@ -11125,6 +11297,9 @@ %%WWWDIR%%/qa/qa/page/component/users_select.rb %%WWWDIR%%/qa/qa/page/dashboard/groups.rb %%WWWDIR%%/qa/qa/page/dashboard/projects.rb +%%WWWDIR%%/qa/qa/page/dashboard/snippet/index.rb +%%WWWDIR%%/qa/qa/page/dashboard/snippet/new.rb +%%WWWDIR%%/qa/qa/page/dashboard/snippet/show.rb %%WWWDIR%%/qa/qa/page/element.rb %%WWWDIR%%/qa/qa/page/file/form.rb %%WWWDIR%%/qa/qa/page/file/shared/commit_message.rb @@ -11221,6 +11396,7 @@ %%WWWDIR%%/qa/qa/resource/runner.rb %%WWWDIR%%/qa/qa/resource/sandbox.rb %%WWWDIR%%/qa/qa/resource/settings/hashed_storage.rb +%%WWWDIR%%/qa/qa/resource/snippet.rb %%WWWDIR%%/qa/qa/resource/ssh_key.rb %%WWWDIR%%/qa/qa/resource/user.rb %%WWWDIR%%/qa/qa/resource/wiki.rb @@ -11229,6 +11405,7 @@ %%WWWDIR%%/qa/qa/runtime/api/request.rb %%WWWDIR%%/qa/qa/runtime/browser.rb %%WWWDIR%%/qa/qa/runtime/env.rb +%%WWWDIR%%/qa/qa/runtime/feature.rb %%WWWDIR%%/qa/qa/runtime/fixtures.rb %%WWWDIR%%/qa/qa/runtime/key/base.rb %%WWWDIR%%/qa/qa/runtime/key/ecdsa.rb @@ -11242,6 +11419,7 @@ %%WWWDIR%%/qa/qa/runtime/user.rb %%WWWDIR%%/qa/qa/scenario/actable.rb %%WWWDIR%%/qa/qa/scenario/bootable.rb +%%WWWDIR%%/qa/qa/scenario/shared_attributes.rb %%WWWDIR%%/qa/qa/scenario/template.rb %%WWWDIR%%/qa/qa/scenario/test/instance.rb %%WWWDIR%%/qa/qa/scenario/test/instance/all.rb @@ -11295,6 +11473,7 @@ %%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb %%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb %%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb %%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_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/ci_variable/add_ci_variable_spec.rb @@ -11306,6 +11485,7 @@ %%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/helpers/quarantine.rb %%WWWDIR%%/qa/qa/specs/runner.rb %%WWWDIR%%/qa/qa/support/api.rb %%WWWDIR%%/qa/qa/support/page/logging.rb @@ -11337,6 +11517,7 @@ %%WWWDIR%%/qa/spec/runtime/api/client_spec.rb %%WWWDIR%%/qa/spec/runtime/api/request_spec.rb %%WWWDIR%%/qa/spec/runtime/env_spec.rb +%%WWWDIR%%/qa/spec/runtime/feature_spec.rb %%WWWDIR%%/qa/spec/runtime/key/ecdsa_spec.rb %%WWWDIR%%/qa/spec/runtime/key/ed25519_spec.rb %%WWWDIR%%/qa/spec/runtime/key/rsa_spec.rb @@ -11345,6 +11526,7 @@ %%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/template_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 @@ -11358,7 +11540,7 @@ %%WWWDIR%%/qa/spec/scenario/test/sanity/selectors_spec.rb %%WWWDIR%%/qa/spec/shared_examples/scenario_shared_examples.rb %%WWWDIR%%/qa/spec/spec_helper.rb -%%WWWDIR%%/qa/spec/spec_helper_spec.rb +%%WWWDIR%%/qa/spec/specs/helpers/quarantine_spec.rb %%WWWDIR%%/qa/spec/specs/runner_spec.rb %%WWWDIR%%/qa/spec/support/waiter_spec.rb %%WWWDIR%%/rubocop/code_reuse_helpers.rb @@ -11418,9 +11600,15 @@ %%WWWDIR%%/scripts/frontend/frontend_script_utils.js %%WWWDIR%%/scripts/frontend/postinstall.js %%WWWDIR%%/scripts/frontend/prettier.js +%%WWWDIR%%/scripts/frontend/stylelint/stylelint-duplicate-selectors.js +%%WWWDIR%%/scripts/frontend/stylelint/stylelint-utility-classes.js +%%WWWDIR%%/scripts/frontend/stylelint/stylelint-utility-map.js +%%WWWDIR%%/scripts/frontend/stylelint/stylelint-utils.js +%%WWWDIR%%/scripts/frontend/stylelint/utility-classes-map.js %%WWWDIR%%/scripts/gitaly-test-build %%WWWDIR%%/scripts/gitaly-test-spawn %%WWWDIR%%/scripts/gitaly_test.rb +%%WWWDIR%%/scripts/insert-rspec-profiling-data %%WWWDIR%%/scripts/lint-changelog-yaml %%WWWDIR%%/scripts/lint-conflicts.sh %%WWWDIR%%/scripts/lint-doc.sh @@ -11472,6 +11660,7 @@ %%WWWDIR%%/spec/controllers/concerns/internal_redirect_spec.rb %%WWWDIR%%/spec/controllers/concerns/issuable_collections_spec.rb %%WWWDIR%%/spec/controllers/concerns/lfs_request_spec.rb +%%WWWDIR%%/spec/controllers/concerns/project_unauthorized_spec.rb %%WWWDIR%%/spec/controllers/concerns/send_file_upload_spec.rb %%WWWDIR%%/spec/controllers/dashboard/groups_controller_spec.rb %%WWWDIR%%/spec/controllers/dashboard/labels_controller_spec.rb @@ -11482,6 +11671,7 @@ %%WWWDIR%%/spec/controllers/explore/groups_controller_spec.rb %%WWWDIR%%/spec/controllers/explore/projects_controller_spec.rb %%WWWDIR%%/spec/controllers/google_api/authorizations_controller_spec.rb +%%WWWDIR%%/spec/controllers/graphql_controller_spec.rb %%WWWDIR%%/spec/controllers/groups/avatars_controller_spec.rb %%WWWDIR%%/spec/controllers/groups/boards_controller_spec.rb %%WWWDIR%%/spec/controllers/groups/children_controller_spec.rb @@ -11544,10 +11734,12 @@ %%WWWDIR%%/spec/controllers/projects/deploy_keys_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/deployments_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/discussions_controller_spec.rb +%%WWWDIR%%/spec/controllers/projects/environments/prometheus_api_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/environments_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/error_tracking_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/find_file_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/forks_controller_spec.rb +%%WWWDIR%%/spec/controllers/projects/git_http_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/graphs_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/group_links_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/hooks_controller_spec.rb @@ -11798,6 +11990,7 @@ %%WWWDIR%%/spec/features/dashboard/activity_spec.rb %%WWWDIR%%/spec/features/dashboard/archived_projects_spec.rb %%WWWDIR%%/spec/features/dashboard/datetime_on_tooltips_spec.rb +%%WWWDIR%%/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb %%WWWDIR%%/spec/features/dashboard/group_spec.rb %%WWWDIR%%/spec/features/dashboard/groups_list_spec.rb %%WWWDIR%%/spec/features/dashboard/help_spec.rb @@ -11836,6 +12029,7 @@ %%WWWDIR%%/spec/features/groups/board_spec.rb %%WWWDIR%%/spec/features/groups/clusters/user_spec.rb %%WWWDIR%%/spec/features/groups/empty_states_spec.rb +%%WWWDIR%%/spec/features/groups/group_page_with_external_authorization_service_spec.rb %%WWWDIR%%/spec/features/groups/group_settings_spec.rb %%WWWDIR%%/spec/features/groups/issues_spec.rb %%WWWDIR%%/spec/features/groups/labels/create_spec.rb @@ -11867,6 +12061,7 @@ %%WWWDIR%%/spec/features/ics/dashboard_issues_spec.rb %%WWWDIR%%/spec/features/ics/group_issues_spec.rb %%WWWDIR%%/spec/features/ics/project_issues_spec.rb +%%WWWDIR%%/spec/features/ide/user_opens_merge_request_spec.rb %%WWWDIR%%/spec/features/ide_spec.rb %%WWWDIR%%/spec/features/import/manifest_import_spec.rb %%WWWDIR%%/spec/features/instance_statistics/cohorts_spec.rb @@ -11993,6 +12188,7 @@ %%WWWDIR%%/spec/features/merge_requests/user_filters_by_labels_spec.rb %%WWWDIR%%/spec/features/merge_requests/user_filters_by_milestones_spec.rb %%WWWDIR%%/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb +%%WWWDIR%%/spec/features/merge_requests/user_filters_by_target_branch_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 @@ -12056,6 +12252,7 @@ %%WWWDIR%%/spec/features/projects/branches/user_views_branches_spec.rb %%WWWDIR%%/spec/features/projects/branches_spec.rb %%WWWDIR%%/spec/features/projects/ci/lint_spec.rb +%%WWWDIR%%/spec/features/projects/classification_label_on_project_pages_spec.rb %%WWWDIR%%/spec/features/projects/clusters/applications_spec.rb %%WWWDIR%%/spec/features/projects/clusters/gcp_spec.rb %%WWWDIR%%/spec/features/projects/clusters/interchangeability_spec.rb @@ -12106,6 +12303,7 @@ %%WWWDIR%%/spec/features/projects/files/user_searches_for_files_spec.rb %%WWWDIR%%/spec/features/projects/files/user_uploads_files_spec.rb %%WWWDIR%%/spec/features/projects/fork_spec.rb +%%WWWDIR%%/spec/features/projects/forks/fork_list_spec.rb %%WWWDIR%%/spec/features/projects/gfm_autocomplete_load_spec.rb %%WWWDIR%%/spec/features/projects/graph_spec.rb %%WWWDIR%%/spec/features/projects/hook_logs/user_reads_log_spec.rb @@ -12113,6 +12311,7 @@ %%WWWDIR%%/spec/features/projects/import_export/import_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/viewing_issues_with_external_authorization_enabled_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 @@ -12164,6 +12363,7 @@ %%WWWDIR%%/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb %%WWWDIR%%/spec/features/projects/services/user_activates_emails_on_push_spec.rb %%WWWDIR%%/spec/features/projects/services/user_activates_flowdock_spec.rb +%%WWWDIR%%/spec/features/projects/services/user_activates_hipchat_spec.rb %%WWWDIR%%/spec/features/projects/services/user_activates_irker_spec.rb %%WWWDIR%%/spec/features/projects/services/user_activates_issue_tracker_spec.rb %%WWWDIR%%/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb @@ -12177,6 +12377,7 @@ %%WWWDIR%%/spec/features/projects/services/user_activates_slack_slash_command_spec.rb %%WWWDIR%%/spec/features/projects/services/user_activates_youtrack_spec.rb %%WWWDIR%%/spec/features/projects/services/user_views_services_spec.rb +%%WWWDIR%%/spec/features/projects/settings/external_authorization_service_settings_spec.rb %%WWWDIR%%/spec/features/projects/settings/forked_project_settings_spec.rb %%WWWDIR%%/spec/features/projects/settings/integration_settings_spec.rb %%WWWDIR%%/spec/features/projects/settings/lfs_settings_spec.rb @@ -12240,6 +12441,7 @@ %%WWWDIR%%/spec/features/projects/wiki/user_views_wiki_empty_spec.rb %%WWWDIR%%/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb %%WWWDIR%%/spec/features/projects/wiki/user_views_wiki_page_spec.rb +%%WWWDIR%%/spec/features/projects/wiki/user_views_wiki_pages_spec.rb %%WWWDIR%%/spec/features/projects_spec.rb %%WWWDIR%%/spec/features/protected_branches_spec.rb %%WWWDIR%%/spec/features/protected_tags_spec.rb @@ -12257,6 +12459,7 @@ %%WWWDIR%%/spec/features/search/user_searches_for_merge_requests_spec.rb %%WWWDIR%%/spec/features/search/user_searches_for_milestones_spec.rb %%WWWDIR%%/spec/features/search/user_searches_for_projects_spec.rb +%%WWWDIR%%/spec/features/search/user_searches_for_users_spec.rb %%WWWDIR%%/spec/features/search/user_searches_for_wiki_pages_spec.rb %%WWWDIR%%/spec/features/search/user_uses_header_search_field_spec.rb %%WWWDIR%%/spec/features/search/user_uses_search_filters_spec.rb @@ -12299,6 +12502,7 @@ %%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_opens_link_to_comment.rb %%WWWDIR%%/spec/features/user_sees_revert_modal_spec.rb %%WWWDIR%%/spec/features/user_sorts_things_spec.rb %%WWWDIR%%/spec/features/users/active_sessions_spec.rb @@ -12364,6 +12568,7 @@ %%WWWDIR%%/spec/finders/users_with_pending_todos_finder_spec.rb %%WWWDIR%%/spec/fixtures/GoogleCodeProjectHosting.json %%WWWDIR%%/spec/fixtures/aosp_manifest.xml +%%WWWDIR%%/spec/fixtures/api/graphql/introspection.graphql %%WWWDIR%%/spec/fixtures/api/schemas/board.json %%WWWDIR%%/spec/fixtures/api/schemas/boards.json %%WWWDIR%%/spec/fixtures/api/schemas/branch.json @@ -12437,6 +12642,7 @@ %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/issue.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/issues.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/license.json +%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/merge_request.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/merge_requests.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/milestone.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/milestones.json @@ -12446,6 +12652,7 @@ %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/pages_domain_basics.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/pages_domains.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json +%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/pipelines.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/project/export_status.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/project/identity.json @@ -12590,6 +12797,8 @@ %%WWWDIR%%/spec/fixtures/pages_empty.zip %%WWWDIR%%/spec/fixtures/pages_empty.zip.meta %%WWWDIR%%/spec/fixtures/pages_non_writeable.zip +%%WWWDIR%%/spec/fixtures/passphrase_x509_certificate.crt +%%WWWDIR%%/spec/fixtures/passphrase_x509_certificate_pk.key %%WWWDIR%%/spec/fixtures/patchfiles/0001-A-commit-from-a-patch.patch %%WWWDIR%%/spec/fixtures/patchfiles/0001-This-does-not-apply-to-the-feature-branch.patch %%WWWDIR%%/spec/fixtures/project_export.tar.gz @@ -12630,21 +12839,140 @@ %%WWWDIR%%/spec/fixtures/unsanitized.svg %%WWWDIR%%/spec/fixtures/valid.po %%WWWDIR%%/spec/fixtures/video_sample.mp4 +%%WWWDIR%%/spec/fixtures/x509_certificate.crt +%%WWWDIR%%/spec/fixtures/x509_certificate_pk.key %%WWWDIR%%/spec/frontend/.eslintrc.yml %%WWWDIR%%/spec/frontend/__mocks__/file_mock.js +%%WWWDIR%%/spec/frontend/behaviors/secret_values_spec.js +%%WWWDIR%%/spec/frontend/blob/blob_fork_suggestion_spec.js +%%WWWDIR%%/spec/frontend/boards/modal_store_spec.js +%%WWWDIR%%/spec/frontend/clusters/clusters_bundle_spec.js +%%WWWDIR%%/spec/frontend/clusters/components/application_row_spec.js +%%WWWDIR%%/spec/frontend/clusters/components/applications_spec.js +%%WWWDIR%%/spec/frontend/clusters/services/mock_data.js +%%WWWDIR%%/spec/frontend/clusters/stores/clusters_store_spec.js +%%WWWDIR%%/spec/frontend/cycle_analytics/limit_warning_component_spec.js +%%WWWDIR%%/spec/frontend/diffs/components/diff_stats_spec.js +%%WWWDIR%%/spec/frontend/diffs/components/edit_button_spec.js +%%WWWDIR%%/spec/frontend/diffs/components/hidden_files_warning_spec.js +%%WWWDIR%%/spec/frontend/diffs/components/no_changes_spec.js +%%WWWDIR%%/spec/frontend/environment.js +%%WWWDIR%%/spec/frontend/error_tracking/components/error_tracking_list_spec.js +%%WWWDIR%%/spec/frontend/error_tracking/store/mutation_spec.js +%%WWWDIR%%/spec/frontend/filtered_search/filtered_search_token_keys_spec.js +%%WWWDIR%%/spec/frontend/filtered_search/services/recent_searches_service_error_spec.js +%%WWWDIR%%/spec/frontend/filtered_search/stores/recent_searches_store_spec.js +%%WWWDIR%%/spec/frontend/frequent_items/store/getters_spec.js %%WWWDIR%%/spec/frontend/gfm_auto_complete_spec.js +%%WWWDIR%%/spec/frontend/helpers/class_spec_helper.js +%%WWWDIR%%/spec/frontend/helpers/fixtures.js +%%WWWDIR%%/spec/frontend/helpers/locale_helper.js +%%WWWDIR%%/spec/frontend/helpers/monitor_helper_spec.js +%%WWWDIR%%/spec/frontend/helpers/scroll_into_view_promise.js +%%WWWDIR%%/spec/frontend/helpers/set_timeout_promise_helper.js %%WWWDIR%%/spec/frontend/helpers/test_constants.js +%%WWWDIR%%/spec/frontend/helpers/timeout.js +%%WWWDIR%%/spec/frontend/helpers/user_mock_data_helper.js +%%WWWDIR%%/spec/frontend/helpers/vue_component_helper.js +%%WWWDIR%%/spec/frontend/helpers/vue_mount_component_helper.js +%%WWWDIR%%/spec/frontend/helpers/vue_resource_helper.js +%%WWWDIR%%/spec/frontend/helpers/vue_test_utils_helper.js +%%WWWDIR%%/spec/frontend/helpers/vuex_action_helper.js +%%WWWDIR%%/spec/frontend/helpers/wait_for_attribute_change.js +%%WWWDIR%%/spec/frontend/helpers/wait_for_promises.js +%%WWWDIR%%/spec/frontend/ide/lib/common/disposable_spec.js +%%WWWDIR%%/spec/frontend/ide/lib/diff/diff_spec.js +%%WWWDIR%%/spec/frontend/ide/lib/editor_options_spec.js +%%WWWDIR%%/spec/frontend/ide/lib/files_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/modules/commit/mutations_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/modules/file_templates/getters_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/modules/pane/getters_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/modules/pane/mutations_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/modules/pipelines/getters_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/mutations/branch_spec.js +%%WWWDIR%%/spec/frontend/ide/stores/mutations/merge_request_spec.js +%%WWWDIR%%/spec/frontend/image_diff/view_types_spec.js +%%WWWDIR%%/spec/frontend/import_projects/store/getters_spec.js +%%WWWDIR%%/spec/frontend/import_projects/store/mutations_spec.js %%WWWDIR%%/spec/frontend/issuable_suggestions/components/app_spec.js %%WWWDIR%%/spec/frontend/issuable_suggestions/components/item_spec.js %%WWWDIR%%/spec/frontend/issuable_suggestions/mock_data.js +%%WWWDIR%%/spec/frontend/jobs/components/empty_state_spec.js +%%WWWDIR%%/spec/frontend/jobs/components/erased_block_spec.js +%%WWWDIR%%/spec/frontend/jobs/components/sidebar_detail_row_spec.js +%%WWWDIR%%/spec/frontend/jobs/components/stuck_block_spec.js +%%WWWDIR%%/spec/frontend/jobs/store/getters_spec.js +%%WWWDIR%%/spec/frontend/jobs/store/mutations_spec.js +%%WWWDIR%%/spec/frontend/labels_select_spec.js %%WWWDIR%%/spec/frontend/lib/utils/ajax_cache_spec.js +%%WWWDIR%%/spec/frontend/lib/utils/autosave_spec.js +%%WWWDIR%%/spec/frontend/lib/utils/cache_spec.js +%%WWWDIR%%/spec/frontend/lib/utils/grammar_spec.js +%%WWWDIR%%/spec/frontend/lib/utils/image_utility_spec.js +%%WWWDIR%%/spec/frontend/lib/utils/number_utility_spec.js +%%WWWDIR%%/spec/frontend/lib/utils/text_utility_spec.js +%%WWWDIR%%/spec/frontend/locale/ensure_single_line_spec.js +%%WWWDIR%%/spec/frontend/locale/sprintf_spec.js +%%WWWDIR%%/spec/frontend/mr_popover/__snapshots__/mr_popover_spec.js.snap +%%WWWDIR%%/spec/frontend/mr_popover/index_spec.js +%%WWWDIR%%/spec/frontend/mr_popover/mr_popover_spec.js +%%WWWDIR%%/spec/frontend/notebook/lib/highlight_spec.js %%WWWDIR%%/spec/frontend/notes/components/__snapshots__/discussion_jump_to_next_button_spec.js.snap %%WWWDIR%%/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js +%%WWWDIR%%/spec/frontend/notes/components/discussion_reply_placeholder_spec.js +%%WWWDIR%%/spec/frontend/notes/components/discussion_resolve_button_spec.js +%%WWWDIR%%/spec/frontend/notes/components/note_attachment_spec.js +%%WWWDIR%%/spec/frontend/notes/components/note_edited_text_spec.js +%%WWWDIR%%/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js %%WWWDIR%%/spec/frontend/pages/profiles/show/emoji_menu_spec.js +%%WWWDIR%%/spec/frontend/performance_bar/services/performance_bar_service_spec.js +%%WWWDIR%%/spec/frontend/pipelines/blank_state_spec.js +%%WWWDIR%%/spec/frontend/pipelines/empty_state_spec.js +%%WWWDIR%%/spec/frontend/pipelines/pipeline_store_spec.js +%%WWWDIR%%/spec/frontend/pipelines/pipelines_store_spec.js +%%WWWDIR%%/spec/frontend/registry/getters_spec.js +%%WWWDIR%%/spec/frontend/reports/components/report_link_spec.js +%%WWWDIR%%/spec/frontend/reports/components/report_section_spec.js +%%WWWDIR%%/spec/frontend/reports/store/utils_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/area_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/environment_row_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/function_details_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/function_row_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/functions_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/missing_prometheus_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/pod_box_spec.js +%%WWWDIR%%/spec/frontend/serverless/components/url_spec.js +%%WWWDIR%%/spec/frontend/serverless/mock_data.js +%%WWWDIR%%/spec/frontend/serverless/store/actions_spec.js +%%WWWDIR%%/spec/frontend/serverless/store/getters_spec.js +%%WWWDIR%%/spec/frontend/serverless/store/mutations_spec.js +%%WWWDIR%%/spec/frontend/serverless/utils.js +%%WWWDIR%%/spec/frontend/sidebar/confidential_edit_buttons_spec.js +%%WWWDIR%%/spec/frontend/sidebar/confidential_edit_form_buttons_spec.js +%%WWWDIR%%/spec/frontend/sidebar/lock/edit_form_spec.js %%WWWDIR%%/spec/frontend/test_setup.js +%%WWWDIR%%/spec/frontend/u2f/util_spec.js +%%WWWDIR%%/spec/frontend/vue_mr_widget/components/mr_widget_container_spec.js +%%WWWDIR%%/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js +%%WWWDIR%%/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js +%%WWWDIR%%/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js +%%WWWDIR%%/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js +%%WWWDIR%%/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js %%WWWDIR%%/spec/frontend/vue_shared/components/__snapshots__/file_row_header_spec.js.snap +%%WWWDIR%%/spec/frontend/vue_shared/components/__snapshots__/resizable_chart_container_spec.js.snap +%%WWWDIR%%/spec/frontend/vue_shared/components/callout_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/code_block_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/diff_viewer/viewers/mode_changed_spec.js %%WWWDIR%%/spec/frontend/vue_shared/components/file_row_header_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/identicon_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/lib/utils/dom_utils_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/markdown/suggestion_diff_row_spec.js %%WWWDIR%%/spec/frontend/vue_shared/components/notes/timeline_entry_item_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/pagination_links_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/resizable_chart_container_spec.js +%%WWWDIR%%/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js +%%WWWDIR%%/spec/frontend/vuex_shared/modules/modal/mutations_spec.js %%WWWDIR%%/spec/graphql/features/authorization_spec.rb %%WWWDIR%%/spec/graphql/gitlab_schema_spec.rb %%WWWDIR%%/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb @@ -12657,6 +12985,8 @@ %%WWWDIR%%/spec/graphql/resolvers/metadata_resolver_spec.rb %%WWWDIR%%/spec/graphql/resolvers/project_pipelines_resolver_spec.rb %%WWWDIR%%/spec/graphql/resolvers/project_resolver_spec.rb +%%WWWDIR%%/spec/graphql/types/base_field_spec.rb +%%WWWDIR%%/spec/graphql/types/ci/detailed_status_type_spec.rb %%WWWDIR%%/spec/graphql/types/ci/pipeline_type_spec.rb %%WWWDIR%%/spec/graphql/types/issuable_state_enum_spec.rb %%WWWDIR%%/spec/graphql/types/issue_state_enum_spec.rb @@ -12664,6 +12994,7 @@ %%WWWDIR%%/spec/graphql/types/merge_request_state_enum_spec.rb %%WWWDIR%%/spec/graphql/types/merge_request_type_spec.rb %%WWWDIR%%/spec/graphql/types/metadata_type_spec.rb +%%WWWDIR%%/spec/graphql/types/milestone_type_spec.rb %%WWWDIR%%/spec/graphql/types/mutation_type_spec.rb %%WWWDIR%%/spec/graphql/types/permission_types/base_permission_type_spec.rb %%WWWDIR%%/spec/graphql/types/permission_types/issue_spec.rb @@ -12673,6 +13004,7 @@ %%WWWDIR%%/spec/graphql/types/project_type_spec.rb %%WWWDIR%%/spec/graphql/types/query_type_spec.rb %%WWWDIR%%/spec/graphql/types/time_type_spec.rb +%%WWWDIR%%/spec/graphql/types/user_type_spec.rb %%WWWDIR%%/spec/helpers/appearances_helper_spec.rb %%WWWDIR%%/spec/helpers/application_helper_spec.rb %%WWWDIR%%/spec/helpers/application_settings_helper_spec.rb @@ -12687,6 +13019,7 @@ %%WWWDIR%%/spec/helpers/button_helper_spec.rb %%WWWDIR%%/spec/helpers/calendar_helper_spec.rb %%WWWDIR%%/spec/helpers/ci_status_helper_spec.rb +%%WWWDIR%%/spec/helpers/clusters_helper_spec.rb %%WWWDIR%%/spec/helpers/commits_helper_spec.rb %%WWWDIR%%/spec/helpers/components_helper_spec.rb %%WWWDIR%%/spec/helpers/dashboard_helper_spec.rb @@ -12772,13 +13105,11 @@ %%WWWDIR%%/spec/javascripts/behaviors/markdown/highlight_current_user_spec.js %%WWWDIR%%/spec/javascripts/behaviors/quick_submit_spec.js %%WWWDIR%%/spec/javascripts/behaviors/requires_input_spec.js -%%WWWDIR%%/spec/javascripts/behaviors/secret_values_spec.js %%WWWDIR%%/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js %%WWWDIR%%/spec/javascripts/blob/3d_viewer/mesh_object_spec.js %%WWWDIR%%/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js %%WWWDIR%%/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js %%WWWDIR%%/spec/javascripts/blob/blob_file_dropzone_spec.js -%%WWWDIR%%/spec/javascripts/blob/blob_fork_suggestion_spec.js %%WWWDIR%%/spec/javascripts/blob/notebook/index_spec.js %%WWWDIR%%/spec/javascripts/blob/pdf/index_spec.js %%WWWDIR%%/spec/javascripts/blob/sketch/index_spec.js @@ -12796,7 +13127,6 @@ %%WWWDIR%%/spec/javascripts/boards/issue_spec.js %%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/bootstrap_jquery_spec.js %%WWWDIR%%/spec/javascripts/bootstrap_linked_tabs_spec.js %%WWWDIR%%/spec/javascripts/branches/branches_delete_modal_spec.js @@ -12805,11 +13135,6 @@ %%WWWDIR%%/spec/javascripts/ci_variable_list/ci_variable_list_spec.js %%WWWDIR%%/spec/javascripts/ci_variable_list/native_form_variable_list_spec.js %%WWWDIR%%/spec/javascripts/close_reopen_report_toggle_spec.js -%%WWWDIR%%/spec/javascripts/clusters/clusters_bundle_spec.js -%%WWWDIR%%/spec/javascripts/clusters/components/application_row_spec.js -%%WWWDIR%%/spec/javascripts/clusters/components/applications_spec.js -%%WWWDIR%%/spec/javascripts/clusters/services/mock_data.js -%%WWWDIR%%/spec/javascripts/clusters/stores/clusters_store_spec.js %%WWWDIR%%/spec/javascripts/collapsed_sidebar_todo_spec.js %%WWWDIR%%/spec/javascripts/comment_type_toggle_spec.js %%WWWDIR%%/spec/javascripts/commit/commit_pipeline_status_component_spec.js @@ -12819,7 +13144,6 @@ %%WWWDIR%%/spec/javascripts/create_item_dropdown_spec.js %%WWWDIR%%/spec/javascripts/create_merge_request_dropdown_spec.js %%WWWDIR%%/spec/javascripts/cycle_analytics/banner_spec.js -%%WWWDIR%%/spec/javascripts/cycle_analytics/limit_warning_component_spec.js %%WWWDIR%%/spec/javascripts/cycle_analytics/total_time_component_spec.js %%WWWDIR%%/spec/javascripts/deploy_keys/components/action_btn_spec.js %%WWWDIR%%/spec/javascripts/deploy_keys/components/app_spec.js @@ -12838,15 +13162,11 @@ %%WWWDIR%%/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/diff_line_note_form_spec.js -%%WWWDIR%%/spec/javascripts/diffs/components/diff_stats_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/diff_table_cell_spec.js -%%WWWDIR%%/spec/javascripts/diffs/components/edit_button_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/file_row_stats_spec.js -%%WWWDIR%%/spec/javascripts/diffs/components/hidden_files_warning_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/image_diff_overlay_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/inline_diff_table_row_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/inline_diff_view_spec.js -%%WWWDIR%%/spec/javascripts/diffs/components/no_changes_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/parallel_diff_table_row_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/parallel_diff_view_spec.js %%WWWDIR%%/spec/javascripts/diffs/components/settings_dropdown_spec.js @@ -12886,8 +13206,6 @@ %%WWWDIR%%/spec/javascripts/environments/environments_store_spec.js %%WWWDIR%%/spec/javascripts/environments/folder/environments_folder_view_spec.js %%WWWDIR%%/spec/javascripts/environments/mock_data.js -%%WWWDIR%%/spec/javascripts/error_tracking/components/error_tracking_list_spec.js -%%WWWDIR%%/spec/javascripts/error_tracking/store/mutation_spec.js %%WWWDIR%%/spec/javascripts/error_tracking_settings/components/app_spec.js %%WWWDIR%%/spec/javascripts/error_tracking_settings/components/error_tracking_form_spec.js %%WWWDIR%%/spec/javascripts/error_tracking_settings/components/project_dropdown_spec.js @@ -12904,66 +13222,65 @@ %%WWWDIR%%/spec/javascripts/filtered_search/dropdown_utils_spec.js %%WWWDIR%%/spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js %%WWWDIR%%/spec/javascripts/filtered_search/filtered_search_manager_spec.js -%%WWWDIR%%/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js %%WWWDIR%%/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js %%WWWDIR%%/spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js %%WWWDIR%%/spec/javascripts/filtered_search/recent_searches_root_spec.js -%%WWWDIR%%/spec/javascripts/filtered_search/services/recent_searches_service_error_spec.js %%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/filtered_search/visual_token_value_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/autocomplete_sources.rb %%WWWDIR%%/spec/javascripts/fixtures/balsamiq.rb -%%WWWDIR%%/spec/javascripts/fixtures/balsamiq_viewer.html.haml %%WWWDIR%%/spec/javascripts/fixtures/blob.rb %%WWWDIR%%/spec/javascripts/fixtures/boards.rb %%WWWDIR%%/spec/javascripts/fixtures/branches.rb %%WWWDIR%%/spec/javascripts/fixtures/clusters.rb %%WWWDIR%%/spec/javascripts/fixtures/commit.rb -%%WWWDIR%%/spec/javascripts/fixtures/create_item_dropdown.html.haml %%WWWDIR%%/spec/javascripts/fixtures/deploy_keys.rb %%WWWDIR%%/spec/javascripts/fixtures/environments/table.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/event_filter.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/gl_dropdown.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/gl_field_errors.html.haml %%WWWDIR%%/spec/javascripts/fixtures/groups.rb %%WWWDIR%%/spec/javascripts/fixtures/images/green_box.png %%WWWDIR%%/spec/javascripts/fixtures/images/red_box.png -%%WWWDIR%%/spec/javascripts/fixtures/issuable_filter.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/issue_sidebar_label.html.haml %%WWWDIR%%/spec/javascripts/fixtures/issues.rb %%WWWDIR%%/spec/javascripts/fixtures/jobs.rb %%WWWDIR%%/spec/javascripts/fixtures/labels.rb -%%WWWDIR%%/spec/javascripts/fixtures/line_highlighter.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/linked_tabs.html.haml %%WWWDIR%%/spec/javascripts/fixtures/merge_requests.rb %%WWWDIR%%/spec/javascripts/fixtures/merge_requests_diffs.rb -%%WWWDIR%%/spec/javascripts/fixtures/merge_requests_show.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/mini_dropdown_graph.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/notebook_viewer.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/oauth_remember_me.html.haml %%WWWDIR%%/spec/javascripts/fixtures/one_white_pixel.png %%WWWDIR%%/spec/javascripts/fixtures/pdf.rb -%%WWWDIR%%/spec/javascripts/fixtures/pdf_viewer.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/pipeline_graph.html.haml %%WWWDIR%%/spec/javascripts/fixtures/pipeline_schedules.rb -%%WWWDIR%%/spec/javascripts/fixtures/pipelines.html.haml %%WWWDIR%%/spec/javascripts/fixtures/pipelines.rb -%%WWWDIR%%/spec/javascripts/fixtures/project_select_combo_button.html.haml %%WWWDIR%%/spec/javascripts/fixtures/projects.json %%WWWDIR%%/spec/javascripts/fixtures/projects.rb %%WWWDIR%%/spec/javascripts/fixtures/prometheus_service.rb %%WWWDIR%%/spec/javascripts/fixtures/raw.rb %%WWWDIR%%/spec/javascripts/fixtures/search.rb -%%WWWDIR%%/spec/javascripts/fixtures/search_autocomplete.html.haml %%WWWDIR%%/spec/javascripts/fixtures/services.rb %%WWWDIR%%/spec/javascripts/fixtures/sessions.rb -%%WWWDIR%%/spec/javascripts/fixtures/signin_tabs.html.haml -%%WWWDIR%%/spec/javascripts/fixtures/sketch_viewer.html.haml %%WWWDIR%%/spec/javascripts/fixtures/snippet.rb +%%WWWDIR%%/spec/javascripts/fixtures/static/README.md +%%WWWDIR%%/spec/javascripts/fixtures/static/ajax_loading_spinner.html +%%WWWDIR%%/spec/javascripts/fixtures/static/balsamiq_viewer.html +%%WWWDIR%%/spec/javascripts/fixtures/static/create_item_dropdown.html +%%WWWDIR%%/spec/javascripts/fixtures/static/event_filter.html +%%WWWDIR%%/spec/javascripts/fixtures/static/gl_dropdown.html +%%WWWDIR%%/spec/javascripts/fixtures/static/gl_field_errors.html +%%WWWDIR%%/spec/javascripts/fixtures/static/issuable_filter.html +%%WWWDIR%%/spec/javascripts/fixtures/static/issue_sidebar_label.html +%%WWWDIR%%/spec/javascripts/fixtures/static/line_highlighter.html +%%WWWDIR%%/spec/javascripts/fixtures/static/linked_tabs.html +%%WWWDIR%%/spec/javascripts/fixtures/static/merge_requests_show.html +%%WWWDIR%%/spec/javascripts/fixtures/static/mini_dropdown_graph.html +%%WWWDIR%%/spec/javascripts/fixtures/static/notebook_viewer.html +%%WWWDIR%%/spec/javascripts/fixtures/static/oauth_remember_me.html +%%WWWDIR%%/spec/javascripts/fixtures/static/pdf_viewer.html +%%WWWDIR%%/spec/javascripts/fixtures/static/pipeline_graph.html +%%WWWDIR%%/spec/javascripts/fixtures/static/pipelines.html +%%WWWDIR%%/spec/javascripts/fixtures/static/project_select_combo_button.html +%%WWWDIR%%/spec/javascripts/fixtures/static/search_autocomplete.html +%%WWWDIR%%/spec/javascripts/fixtures/static/signin_tabs.html +%%WWWDIR%%/spec/javascripts/fixtures/static/sketch_viewer.html %%WWWDIR%%/spec/javascripts/fixtures/static_fixtures.rb %%WWWDIR%%/spec/javascripts/fixtures/todos.rb %%WWWDIR%%/spec/javascripts/fixtures/u2f.rb @@ -12975,7 +13292,6 @@ %%WWWDIR%%/spec/javascripts/frequent_items/components/frequent_items_search_input_spec.js %%WWWDIR%%/spec/javascripts/frequent_items/mock_data.js %%WWWDIR%%/spec/javascripts/frequent_items/store/actions_spec.js -%%WWWDIR%%/spec/javascripts/frequent_items/store/getters_spec.js %%WWWDIR%%/spec/javascripts/frequent_items/store/mutations_spec.js %%WWWDIR%%/spec/javascripts/frequent_items/utils_spec.js %%WWWDIR%%/spec/javascripts/gl_dropdown_spec.js @@ -13067,15 +13383,11 @@ %%WWWDIR%%/spec/javascripts/ide/components/shared/tokened_input_spec.js %%WWWDIR%%/spec/javascripts/ide/helpers.js %%WWWDIR%%/spec/javascripts/ide/ide_router_spec.js -%%WWWDIR%%/spec/javascripts/ide/lib/common/disposable_spec.js %%WWWDIR%%/spec/javascripts/ide/lib/common/model_manager_spec.js %%WWWDIR%%/spec/javascripts/ide/lib/common/model_spec.js %%WWWDIR%%/spec/javascripts/ide/lib/decorations/controller_spec.js %%WWWDIR%%/spec/javascripts/ide/lib/diff/controller_spec.js -%%WWWDIR%%/spec/javascripts/ide/lib/diff/diff_spec.js -%%WWWDIR%%/spec/javascripts/ide/lib/editor_options_spec.js %%WWWDIR%%/spec/javascripts/ide/lib/editor_spec.js -%%WWWDIR%%/spec/javascripts/ide/lib/files_spec.js %%WWWDIR%%/spec/javascripts/ide/mock_data.js %%WWWDIR%%/spec/javascripts/ide/stores/actions/file_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/actions/merge_request_spec.js @@ -13087,21 +13399,13 @@ %%WWWDIR%%/spec/javascripts/ide/stores/modules/branches/mutations_spec.js %%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/pane/actions_spec.js -%%WWWDIR%%/spec/javascripts/ide/stores/modules/pane/getters_spec.js -%%WWWDIR%%/spec/javascripts/ide/stores/modules/pane/mutations_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js -%%WWWDIR%%/spec/javascripts/ide/stores/modules/pipelines/getters_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js -%%WWWDIR%%/spec/javascripts/ide/stores/mutations/branch_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/mutations/file_spec.js -%%WWWDIR%%/spec/javascripts/ide/stores/mutations/merge_request_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/mutations/tree_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/mutations_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/utils_spec.js @@ -13114,13 +13418,10 @@ %%WWWDIR%%/spec/javascripts/image_diff/init_discussion_tab_spec.js %%WWWDIR%%/spec/javascripts/image_diff/mock_data.js %%WWWDIR%%/spec/javascripts/image_diff/replaced_image_diff_spec.js -%%WWWDIR%%/spec/javascripts/image_diff/view_types_spec.js %%WWWDIR%%/spec/javascripts/import_projects/components/import_projects_table_spec.js %%WWWDIR%%/spec/javascripts/import_projects/components/imported_project_table_row_spec.js %%WWWDIR%%/spec/javascripts/import_projects/components/provider_repo_table_row_spec.js %%WWWDIR%%/spec/javascripts/import_projects/store/actions_spec.js -%%WWWDIR%%/spec/javascripts/import_projects/store/getters_spec.js -%%WWWDIR%%/spec/javascripts/import_projects/store/mutations_spec.js %%WWWDIR%%/spec/javascripts/importer_status_spec.js %%WWWDIR%%/spec/javascripts/integrations/integration_settings_form_spec.js %%WWWDIR%%/spec/javascripts/issuable_spec.js @@ -13139,53 +13440,41 @@ %%WWWDIR%%/spec/javascripts/issue_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/job_app_spec.js %%WWWDIR%%/spec/javascripts/jobs/components/job_container_item_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/jobs_container_spec.js -%%WWWDIR%%/spec/javascripts/jobs/components/sidebar_detail_row_spec.js %%WWWDIR%%/spec/javascripts/jobs/components/sidebar_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_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/unmet_prerequisites_block_spec.js %%WWWDIR%%/spec/javascripts/jobs/mixins/delayed_job_mixin_spec.js %%WWWDIR%%/spec/javascripts/jobs/mock_data.js %%WWWDIR%%/spec/javascripts/jobs/store/actions_spec.js -%%WWWDIR%%/spec/javascripts/jobs/store/getters_spec.js %%WWWDIR%%/spec/javascripts/jobs/store/helpers.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 %%WWWDIR%%/spec/javascripts/lazy_loader_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/accessor_spec.js -%%WWWDIR%%/spec/javascripts/lib/utils/cache_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/common_utils_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/csrf_token_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/datetime_utility_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/dom_utils_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/file_upload_spec.js -%%WWWDIR%%/spec/javascripts/lib/utils/grammar_spec.js +%%WWWDIR%%/spec/javascripts/lib/utils/higlight_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/icon_utils_spec.js -%%WWWDIR%%/spec/javascripts/lib/utils/image_utility_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/mock_data.js %%WWWDIR%%/spec/javascripts/lib/utils/navigation_utility_spec.js -%%WWWDIR%%/spec/javascripts/lib/utils/number_utility_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/poll_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/sticky_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/text_markdown_spec.js -%%WWWDIR%%/spec/javascripts/lib/utils/text_utility_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/tick_formats_spec.js %%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 %%WWWDIR%%/spec/javascripts/merge_request_spec.js %%WWWDIR%%/spec/javascripts/merge_request_tabs_spec.js @@ -13195,6 +13484,7 @@ %%WWWDIR%%/spec/javascripts/monitoring/dashboard_state_spec.js %%WWWDIR%%/spec/javascripts/monitoring/mock_data.js %%WWWDIR%%/spec/javascripts/monitoring/monitoring_store_spec.js +%%WWWDIR%%/spec/javascripts/monitoring/utils_spec.js %%WWWDIR%%/spec/javascripts/namespace_select_spec.js %%WWWDIR%%/spec/javascripts/new_branch_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/code_spec.js @@ -13204,22 +13494,17 @@ %%WWWDIR%%/spec/javascripts/notebook/cells/output/index_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/prompt_spec.js %%WWWDIR%%/spec/javascripts/notebook/index_spec.js -%%WWWDIR%%/spec/javascripts/notebook/lib/highlight_spec.js %%WWWDIR%%/spec/javascripts/notes/components/comment_form_spec.js %%WWWDIR%%/spec/javascripts/notes/components/diff_with_note_spec.js %%WWWDIR%%/spec/javascripts/notes/components/discussion_counter_spec.js %%WWWDIR%%/spec/javascripts/notes/components/discussion_filter_note_spec.js %%WWWDIR%%/spec/javascripts/notes/components/discussion_filter_spec.js -%%WWWDIR%%/spec/javascripts/notes/components/discussion_reply_placeholder_spec.js -%%WWWDIR%%/spec/javascripts/notes/components/discussion_resolve_button_spec.js %%WWWDIR%%/spec/javascripts/notes/components/discussion_resolve_with_issue_button_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_actions/reply_button_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_actions_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_app_spec.js -%%WWWDIR%%/spec/javascripts/notes/components/note_attachment_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_awards_list_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_body_spec.js -%%WWWDIR%%/spec/javascripts/notes/components/note_edited_text_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_form_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_header_spec.js %%WWWDIR%%/spec/javascripts/notes/components/note_signed_out_widget_spec.js @@ -13235,7 +13520,6 @@ %%WWWDIR%%/spec/javascripts/notes_spec.js %%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 @@ -13244,6 +13528,7 @@ %%WWWDIR%%/spec/javascripts/pages/milestones/shared/components/promote_milestone_modal_spec.js %%WWWDIR%%/spec/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input_spec.js %%WWWDIR%%/spec/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js +%%WWWDIR%%/spec/javascripts/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js %%WWWDIR%%/spec/javascripts/pages/sessions/new/preserve_url_fragment_spec.js %%WWWDIR%%/spec/javascripts/pdf/index_spec.js %%WWWDIR%%/spec/javascripts/pdf/page_spec.js @@ -13252,10 +13537,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/persistent_user_callout_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 %%WWWDIR%%/spec/javascripts/pipelines/graph/graph_component_spec.js %%WWWDIR%%/spec/javascripts/pipelines/graph/job_group_dropdown_spec.js @@ -13267,12 +13549,10 @@ %%WWWDIR%%/spec/javascripts/pipelines/mock_data.js %%WWWDIR%%/spec/javascripts/pipelines/nav_controls_spec.js %%WWWDIR%%/spec/javascripts/pipelines/pipeline_details_mediator_spec.js -%%WWWDIR%%/spec/javascripts/pipelines/pipeline_store_spec.js %%WWWDIR%%/spec/javascripts/pipelines/pipeline_url_spec.js %%WWWDIR%%/spec/javascripts/pipelines/pipelines_actions_spec.js %%WWWDIR%%/spec/javascripts/pipelines/pipelines_artifacts_spec.js %%WWWDIR%%/spec/javascripts/pipelines/pipelines_spec.js -%%WWWDIR%%/spec/javascripts/pipelines/pipelines_store_spec.js %%WWWDIR%%/spec/javascripts/pipelines/pipelines_table_row_spec.js %%WWWDIR%%/spec/javascripts/pipelines/pipelines_table_spec.js %%WWWDIR%%/spec/javascripts/pipelines/stage_spec.js @@ -13301,10 +13581,12 @@ %%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 -%%WWWDIR%%/spec/javascripts/registry/getters_spec.js %%WWWDIR%%/spec/javascripts/registry/mock_data.js %%WWWDIR%%/spec/javascripts/registry/stores/actions_spec.js %%WWWDIR%%/spec/javascripts/registry/stores/mutations_spec.js +%%WWWDIR%%/spec/javascripts/related_merge_requests/components/related_merge_requests_spec.js +%%WWWDIR%%/spec/javascripts/related_merge_requests/store/actions_spec.js +%%WWWDIR%%/spec/javascripts/related_merge_requests/store/mutations_spec.js %%WWWDIR%%/spec/javascripts/releases/components/app_spec.js %%WWWDIR%%/spec/javascripts/releases/components/release_block_spec.js %%WWWDIR%%/spec/javascripts/releases/mock_data.js @@ -13314,8 +13596,6 @@ %%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 @@ -13325,27 +13605,17 @@ %%WWWDIR%%/spec/javascripts/reports/mock_data/resolved_failures.json %%WWWDIR%%/spec/javascripts/reports/store/actions_spec.js %%WWWDIR%%/spec/javascripts/reports/store/mutations_spec.js -%%WWWDIR%%/spec/javascripts/reports/store/utils_spec.js %%WWWDIR%%/spec/javascripts/right_sidebar_spec.js %%WWWDIR%%/spec/javascripts/search_autocomplete_spec.js %%WWWDIR%%/spec/javascripts/search_spec.js -%%WWWDIR%%/spec/javascripts/serverless/components/environment_row_spec.js -%%WWWDIR%%/spec/javascripts/serverless/components/function_row_spec.js -%%WWWDIR%%/spec/javascripts/serverless/components/functions_spec.js -%%WWWDIR%%/spec/javascripts/serverless/components/url_spec.js -%%WWWDIR%%/spec/javascripts/serverless/mock_data.js -%%WWWDIR%%/spec/javascripts/serverless/stores/serverless_store_spec.js %%WWWDIR%%/spec/javascripts/settings_panels_spec.js %%WWWDIR%%/spec/javascripts/shared/popover_spec.js %%WWWDIR%%/spec/javascripts/shortcuts_spec.js %%WWWDIR%%/spec/javascripts/sidebar/assignee_title_spec.js %%WWWDIR%%/spec/javascripts/sidebar/assignees_spec.js %%WWWDIR%%/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js -%%WWWDIR%%/spec/javascripts/sidebar/confidential_edit_buttons_spec.js -%%WWWDIR%%/spec/javascripts/sidebar/confidential_edit_form_buttons_spec.js %%WWWDIR%%/spec/javascripts/sidebar/confidential_issue_sidebar_spec.js %%WWWDIR%%/spec/javascripts/sidebar/lock/edit_form_buttons_spec.js -%%WWWDIR%%/spec/javascripts/sidebar/lock/edit_form_spec.js %%WWWDIR%%/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js %%WWWDIR%%/spec/javascripts/sidebar/mock_data.js %%WWWDIR%%/spec/javascripts/sidebar/participants_spec.js @@ -13367,15 +13637,13 @@ %%WWWDIR%%/spec/javascripts/u2f/authenticate_spec.js %%WWWDIR%%/spec/javascripts/u2f/mock_u2f_device.js %%WWWDIR%%/spec/javascripts/u2f/register_spec.js -%%WWWDIR%%/spec/javascripts/u2f/util_spec.js %%WWWDIR%%/spec/javascripts/user_popovers_spec.js %%WWWDIR%%/spec/javascripts/version_check_image_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/deployment_spec.js +%%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js -%%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_container_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js -%%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_icon_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js @@ -13384,13 +13652,10 @@ %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/review_app_link_spec.js -%%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/commit_edit_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_archived_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_checking_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_closed_spec.js -%%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js -%%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_commits_header_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js @@ -13408,21 +13673,17 @@ %%WWWDIR%%/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/mock_data.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js -%%WWWDIR%%/spec/javascripts/vue_mr_widget/stores/get_state_key_spec.js %%WWWDIR%%/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/bar_chart_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/callout_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/changed_file_icon_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/ci_badge_link_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/ci_icon_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/clipboard_button_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/code_block_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/commit_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/content_viewer/content_viewer_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/deprecated_modal_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/diff_viewer/diff_viewer_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/diff_viewer/viewers/mode_changed_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/dropdown/dropdown_button_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/dropdown/dropdown_hidden_input_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/dropdown/dropdown_search_input_spec.js @@ -13438,13 +13699,11 @@ %%WWWDIR%%/spec/javascripts/vue_shared/components/gl_modal_vuex_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/header_ci_component_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/icon_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/identicon_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/issue/issue_assignees_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/issue/issue_milestone_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/issue/issue_warning_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/issue/related_issuable_item_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/lib/utils/dom_utils_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/loading_button_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/markdown/field_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/markdown/header_spec.js @@ -13458,10 +13717,11 @@ %%WWWDIR%%/spec/javascripts/vue_shared/components/notes/placeholder_note_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/notes/system_note_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/pagination_links_spec.js %%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/project_selector/project_list_item_spec.js +%%WWWDIR%%/spec/javascripts/vue_shared/components/project_selector/project_selector_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 @@ -13481,7 +13741,6 @@ %%WWWDIR%%/spec/javascripts/vue_shared/components/table_pagination_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/tabs/tab_spec.js %%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 @@ -13492,10 +13751,11 @@ %%WWWDIR%%/spec/javascripts/vue_shared/directives/tooltip_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/translate_spec.js %%WWWDIR%%/spec/javascripts/vuex_shared/modules/modal/actions_spec.js -%%WWWDIR%%/spec/javascripts/vuex_shared/modules/modal/mutations_spec.js %%WWWDIR%%/spec/javascripts/zen_mode_spec.js %%WWWDIR%%/spec/lib/after_commit_queue_spec.rb %%WWWDIR%%/spec/lib/api/api_spec.rb +%%WWWDIR%%/spec/lib/api/entities/job_request/image_spec.rb +%%WWWDIR%%/spec/lib/api/entities/job_request/port_spec.rb %%WWWDIR%%/spec/lib/api/helpers/custom_validators_spec.rb %%WWWDIR%%/spec/lib/api/helpers/pagination_spec.rb %%WWWDIR%%/spec/lib/api/helpers/related_resources_helpers_spec.rb @@ -13504,6 +13764,7 @@ %%WWWDIR%%/spec/lib/backup/files_spec.rb %%WWWDIR%%/spec/lib/backup/manager_spec.rb %%WWWDIR%%/spec/lib/backup/repository_spec.rb +%%WWWDIR%%/spec/lib/backup/uploads_spec.rb %%WWWDIR%%/spec/lib/banzai/color_parser_spec.rb %%WWWDIR%%/spec/lib/banzai/commit_renderer_spec.rb %%WWWDIR%%/spec/lib/banzai/cross_project_reference_spec.rb @@ -13534,6 +13795,7 @@ %%WWWDIR%%/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/mermaid_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/milestone_reference_filter_spec.rb +%%WWWDIR%%/spec/lib/banzai/filter/output_safety_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 @@ -13572,7 +13834,6 @@ %%WWWDIR%%/spec/lib/banzai/reference_parser/user_parser_spec.rb %%WWWDIR%%/spec/lib/banzai/render_context_spec.rb %%WWWDIR%%/spec/lib/banzai/renderer_spec.rb -%%WWWDIR%%/spec/lib/banzai/suggestions_parser_spec.rb %%WWWDIR%%/spec/lib/bitbucket/collection_spec.rb %%WWWDIR%%/spec/lib/bitbucket/connection_spec.rb %%WWWDIR%%/spec/lib/bitbucket/page_spec.rb @@ -13636,6 +13897,7 @@ %%WWWDIR%%/spec/lib/gitlab/auth/user_access_denied_reason_spec.rb %%WWWDIR%%/spec/lib/gitlab/auth/user_auth_finders_spec.rb %%WWWDIR%%/spec/lib/gitlab/auth_spec.rb +%%WWWDIR%%/spec/lib/gitlab/authorized_keys_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/add_merge_request_diff_commits_count_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/archive_legacy_traces_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/backfill_hashed_project_repositories_spec.rb @@ -13663,6 +13925,7 @@ %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_external_pipeline_source_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_import_state_spec.rb +%%WWWDIR%%/spec/lib/gitlab/background_migration/populate_merge_request_assignees_table_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_improved_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_merge_requests_latest_merge_request_diff_id_spec.rb @@ -13728,6 +13991,9 @@ %%WWWDIR%%/spec/lib/gitlab/ci/build/policy/refs_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/build/policy/variables_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/build/policy_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/build/port_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/build/prerequisite/factory_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/build/step_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/charts_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/artifacts_spec.rb @@ -13743,6 +14009,8 @@ %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/key_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/paths_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/policy_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/config/entry/port_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/config/entry/ports_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/reports_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/retry_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/script_spec.rb @@ -13804,9 +14072,11 @@ %%WWWDIR%%/spec/lib/gitlab/ci/status/build/factory_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/failed_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/status/build/failed_unmet_prerequisites_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/manual_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/pending_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/play_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/status/build/preparing_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/retried_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/retryable_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/build/scheduled_spec.rb @@ -13828,6 +14098,7 @@ %%WWWDIR%%/spec/lib/gitlab/ci/status/pipeline/common_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/pipeline/delayed_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/pipeline/factory_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/status/preparing_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/running_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/scheduled_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/status/skipped_spec.rb @@ -13892,6 +14163,7 @@ %%WWWDIR%%/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb %%WWWDIR%%/spec/lib/gitlab/daemon_spec.rb %%WWWDIR%%/spec/lib/gitlab/danger/helper_spec.rb +%%WWWDIR%%/spec/lib/gitlab/danger/teammate_spec.rb %%WWWDIR%%/spec/lib/gitlab/data_builder/build_spec.rb %%WWWDIR%%/spec/lib/gitlab/data_builder/note_spec.rb %%WWWDIR%%/spec/lib/gitlab/data_builder/pipeline_spec.rb @@ -13943,6 +14215,9 @@ %%WWWDIR%%/spec/lib/gitlab/diff/parser_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/position_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/position_tracer_spec.rb +%%WWWDIR%%/spec/lib/gitlab/diff/suggestion_diff_spec.rb +%%WWWDIR%%/spec/lib/gitlab/diff/suggestion_spec.rb +%%WWWDIR%%/spec/lib/gitlab/diff/suggestions_parser_spec.rb %%WWWDIR%%/spec/lib/gitlab/discussions_diff/file_collection_spec.rb %%WWWDIR%%/spec/lib/gitlab/discussions_diff/highlight_cache_spec.rb %%WWWDIR%%/spec/lib/gitlab/downtime_check/message_spec.rb @@ -13964,6 +14239,12 @@ %%WWWDIR%%/spec/lib/gitlab/etag_caching/router_spec.rb %%WWWDIR%%/spec/lib/gitlab/exclusive_lease_helpers_spec.rb %%WWWDIR%%/spec/lib/gitlab/exclusive_lease_spec.rb +%%WWWDIR%%/spec/lib/gitlab/external_authorization/access_spec.rb +%%WWWDIR%%/spec/lib/gitlab/external_authorization/cache_spec.rb +%%WWWDIR%%/spec/lib/gitlab/external_authorization/client_spec.rb +%%WWWDIR%%/spec/lib/gitlab/external_authorization/logger_spec.rb +%%WWWDIR%%/spec/lib/gitlab/external_authorization/response_spec.rb +%%WWWDIR%%/spec/lib/gitlab/external_authorization_spec.rb %%WWWDIR%%/spec/lib/gitlab/fake_application_settings_spec.rb %%WWWDIR%%/spec/lib/gitlab/favicon_spec.rb %%WWWDIR%%/spec/lib/gitlab/file_detector_spec.rb @@ -14072,6 +14353,7 @@ %%WWWDIR%%/spec/lib/gitlab/gitlab_import/client_spec.rb %%WWWDIR%%/spec/lib/gitlab/gitlab_import/importer_spec.rb %%WWWDIR%%/spec/lib/gitlab/gitlab_import/project_creator_spec.rb +%%WWWDIR%%/spec/lib/gitlab/gl_repository/repo_type_spec.rb %%WWWDIR%%/spec/lib/gitlab/gl_repository_spec.rb %%WWWDIR%%/spec/lib/gitlab/gon_helper_spec.rb %%WWWDIR%%/spec/lib/gitlab/google_code_import/client_spec.rb @@ -14081,11 +14363,13 @@ %%WWWDIR%%/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb %%WWWDIR%%/spec/lib/gitlab/gpg_spec.rb %%WWWDIR%%/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb +%%WWWDIR%%/spec/lib/gitlab/graphql/authorize/authorize_field_service_spec.rb %%WWWDIR%%/spec/lib/gitlab/graphql/authorize/authorize_resource_spec.rb -%%WWWDIR%%/spec/lib/gitlab/graphql/authorize/instrumentation_spec.rb %%WWWDIR%%/spec/lib/gitlab/graphql/connections/keyset_connection_spec.rb %%WWWDIR%%/spec/lib/gitlab/graphql/loaders/batch_model_loader_spec.rb +%%WWWDIR%%/spec/lib/gitlab/graphql/tracing_spec.rb %%WWWDIR%%/spec/lib/gitlab/graphs/commits_spec.rb +%%WWWDIR%%/spec/lib/gitlab/group_search_results_spec.rb %%WWWDIR%%/spec/lib/gitlab/hashed_storage/migrator_spec.rb %%WWWDIR%%/spec/lib/gitlab/health_checks/db_check_spec.rb %%WWWDIR%%/spec/lib/gitlab/health_checks/gitaly_check_spec.rb @@ -14109,6 +14393,7 @@ %%WWWDIR%%/spec/lib/gitlab/identifier_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/merge_request_helpers_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 @@ -14211,6 +14496,7 @@ %%WWWDIR%%/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb %%WWWDIR%%/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb %%WWWDIR%%/spec/lib/gitlab/metrics/system_spec.rb +%%WWWDIR%%/spec/lib/gitlab/metrics/transaction_spec.rb %%WWWDIR%%/spec/lib/gitlab/metrics/web_transaction_spec.rb %%WWWDIR%%/spec/lib/gitlab/metrics_spec.rb %%WWWDIR%%/spec/lib/gitlab/middleware/basic_health_check_spec.rb @@ -14246,9 +14532,11 @@ %%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 +%%WWWDIR%%/spec/lib/gitlab/prometheus/queries/knative_invocation_query_spec.rb %%WWWDIR%%/spec/lib/gitlab/prometheus/queries/matched_metric_query_spec.rb %%WWWDIR%%/spec/lib/gitlab/prometheus/query_variables_spec.rb %%WWWDIR%%/spec/lib/gitlab/prometheus_client_spec.rb +%%WWWDIR%%/spec/lib/gitlab/push_options_spec.rb %%WWWDIR%%/spec/lib/gitlab/query_limiting/active_support_subscriber_spec.rb %%WWWDIR%%/spec/lib/gitlab/query_limiting/middleware_spec.rb %%WWWDIR%%/spec/lib/gitlab/query_limiting/transaction_spec.rb @@ -14437,6 +14725,7 @@ %%WWWDIR%%/spec/migrations/clean_stage_id_reference_migration_spec.rb %%WWWDIR%%/spec/migrations/clean_stages_statuses_migration_spec.rb %%WWWDIR%%/spec/migrations/clean_up_for_members_spec.rb +%%WWWDIR%%/spec/migrations/clean_up_noteable_id_for_notes_on_commits_spec.rb %%WWWDIR%%/spec/migrations/clean_upload_symlinks_spec.rb %%WWWDIR%%/spec/migrations/cleanup_build_stage_migration_spec.rb %%WWWDIR%%/spec/migrations/cleanup_environments_external_url_spec.rb @@ -14510,13 +14799,16 @@ %%WWWDIR%%/spec/migrations/schedule_merge_request_diff_migrations_spec.rb %%WWWDIR%%/spec/migrations/schedule_merge_request_diff_migrations_take_two_spec.rb %%WWWDIR%%/spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb +%%WWWDIR%%/spec/migrations/schedule_populate_merge_request_assignees_table_spec.rb %%WWWDIR%%/spec/migrations/schedule_populate_merge_request_metrics_with_events_data_spec.rb %%WWWDIR%%/spec/migrations/schedule_runners_token_encryption_spec.rb %%WWWDIR%%/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb %%WWWDIR%%/spec/migrations/schedule_stages_index_migration_spec.rb +%%WWWDIR%%/spec/migrations/schedule_sync_issuables_state_id_spec.rb %%WWWDIR%%/spec/migrations/schedule_to_archive_legacy_traces_spec.rb %%WWWDIR%%/spec/migrations/steal_fill_store_upload_spec.rb %%WWWDIR%%/spec/migrations/track_untracked_uploads_spec.rb +%%WWWDIR%%/spec/migrations/truncate_user_fullname_spec.rb %%WWWDIR%%/spec/migrations/turn_nested_groups_into_regular_groups_for_mysql_spec.rb %%WWWDIR%%/spec/migrations/update_legacy_diff_notes_type_for_import_spec.rb %%WWWDIR%%/spec/migrations/update_notes_type_for_import_spec.rb @@ -14620,6 +14912,7 @@ %%WWWDIR%%/spec/models/concerns/has_variable_spec.rb %%WWWDIR%%/spec/models/concerns/ignorable_column_spec.rb %%WWWDIR%%/spec/models/concerns/issuable_spec.rb +%%WWWDIR%%/spec/models/concerns/issuable_states_spec.rb %%WWWDIR%%/spec/models/concerns/loaded_in_group_list_spec.rb %%WWWDIR%%/spec/models/concerns/manual_inverse_association_spec.rb %%WWWDIR%%/spec/models/concerns/maskable_spec.rb @@ -14765,6 +15058,7 @@ %%WWWDIR%%/spec/models/project_services/flowdock_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 %%WWWDIR%%/spec/models/project_services/irker_service_spec.rb %%WWWDIR%%/spec/models/project_services/issue_tracker_service_spec.rb %%WWWDIR%%/spec/models/project_services/jira_service_spec.rb @@ -14805,6 +15099,7 @@ %%WWWDIR%%/spec/models/resource_label_event_spec.rb %%WWWDIR%%/spec/models/route_spec.rb %%WWWDIR%%/spec/models/sent_notification_spec.rb +%%WWWDIR%%/spec/models/serverless/function_spec.rb %%WWWDIR%%/spec/models/service_spec.rb %%WWWDIR%%/spec/models/shard_spec.rb %%WWWDIR%%/spec/models/snippet_blob_spec.rb @@ -14845,9 +15140,12 @@ %%WWWDIR%%/spec/policies/deploy_token_policy_spec.rb %%WWWDIR%%/spec/policies/environment_policy_spec.rb %%WWWDIR%%/spec/policies/global_policy_spec.rb +%%WWWDIR%%/spec/policies/group_member_policy_spec.rb %%WWWDIR%%/spec/policies/group_policy_spec.rb +%%WWWDIR%%/spec/policies/identity_provider_policy_spec.rb %%WWWDIR%%/spec/policies/issuable_policy_spec.rb %%WWWDIR%%/spec/policies/issue_policy_spec.rb +%%WWWDIR%%/spec/policies/merge_request_policy_spec.rb %%WWWDIR%%/spec/policies/namespace_policy_spec.rb %%WWWDIR%%/spec/policies/note_policy_spec.rb %%WWWDIR%%/spec/policies/personal_snippet_policy_spec.rb @@ -14857,6 +15155,7 @@ %%WWWDIR%%/spec/policies/user_policy_spec.rb %%WWWDIR%%/spec/presenters/blob_presenter_spec.rb %%WWWDIR%%/spec/presenters/blobs/unfold_presenter_spec.rb +%%WWWDIR%%/spec/presenters/ci/bridge_presenter_spec.rb %%WWWDIR%%/spec/presenters/ci/build_presenter_spec.rb %%WWWDIR%%/spec/presenters/ci/build_runner_presenter_spec.rb %%WWWDIR%%/spec/presenters/ci/group_variable_presenter_spec.rb @@ -14901,6 +15200,7 @@ %%WWWDIR%%/spec/requests/api/events_spec.rb %%WWWDIR%%/spec/requests/api/features_spec.rb %%WWWDIR%%/spec/requests/api/files_spec.rb +%%WWWDIR%%/spec/requests/api/graphql/gitlab_schema_spec.rb %%WWWDIR%%/spec/requests/api/graphql/metadata_query_spec.rb %%WWWDIR%%/spec/requests/api/graphql/mutations/merge_requests/set_wip_spec.rb %%WWWDIR%%/spec/requests/api/graphql/project/issues_spec.rb @@ -15137,6 +15437,7 @@ %%WWWDIR%%/spec/services/ci/extract_sections_from_build_trace_service_spec.rb %%WWWDIR%%/spec/services/ci/pipeline_trigger_service_spec.rb %%WWWDIR%%/spec/services/ci/play_build_service_spec.rb +%%WWWDIR%%/spec/services/ci/prepare_build_service_spec.rb %%WWWDIR%%/spec/services/ci/process_build_service_spec.rb %%WWWDIR%%/spec/services/ci/process_pipeline_service_spec.rb %%WWWDIR%%/spec/services/ci/register_job_service_spec.rb @@ -15187,10 +15488,11 @@ %%WWWDIR%%/spec/services/files/delete_service_spec.rb %%WWWDIR%%/spec/services/files/multi_service_spec.rb %%WWWDIR%%/spec/services/files/update_service_spec.rb -%%WWWDIR%%/spec/services/git_push_service_spec.rb -%%WWWDIR%%/spec/services/git_tag_push_service_spec.rb +%%WWWDIR%%/spec/services/git/branch_push_service_spec.rb +%%WWWDIR%%/spec/services/git/tag_push_service_spec.rb %%WWWDIR%%/spec/services/gpg_keys/create_service_spec.rb %%WWWDIR%%/spec/services/gravatar_service_spec.rb +%%WWWDIR%%/spec/services/groups/auto_devops_service_spec.rb %%WWWDIR%%/spec/services/groups/create_service_spec.rb %%WWWDIR%%/spec/services/groups/destroy_service_spec.rb %%WWWDIR%%/spec/services/groups/nested_create_service_spec.rb @@ -15245,7 +15547,9 @@ %%WWWDIR%%/spec/services/merge_requests/merge_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/merge_to_ref_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb +%%WWWDIR%%/spec/services/merge_requests/migrate_external_diffs_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/post_merge_service_spec.rb +%%WWWDIR%%/spec/services/merge_requests/push_options_handler_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/rebase_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/refresh_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/reload_diffs_service_spec.rb @@ -15329,6 +15633,7 @@ %%WWWDIR%%/spec/services/projects/update_remote_mirror_service_spec.rb %%WWWDIR%%/spec/services/projects/update_service_spec.rb %%WWWDIR%%/spec/services/prometheus/adapter_service_spec.rb +%%WWWDIR%%/spec/services/prometheus/proxy_service_spec.rb %%WWWDIR%%/spec/services/protected_branches/create_service_spec.rb %%WWWDIR%%/spec/services/protected_branches/destroy_service_spec.rb %%WWWDIR%%/spec/services/protected_branches/update_service_spec.rb @@ -15355,6 +15660,7 @@ %%WWWDIR%%/spec/services/submodules/update_service_spec.rb %%WWWDIR%%/spec/services/suggestions/apply_service_spec.rb %%WWWDIR%%/spec/services/suggestions/create_service_spec.rb +%%WWWDIR%%/spec/services/suggestions/outdate_service_spec.rb %%WWWDIR%%/spec/services/system_hooks_service_spec.rb %%WWWDIR%%/spec/services/system_note_service_spec.rb %%WWWDIR%%/spec/services/tags/create_service_spec.rb @@ -15415,8 +15721,8 @@ %%WWWDIR%%/spec/support/cycle_analytics_helpers/test_generation.rb %%WWWDIR%%/spec/support/database_cleaner.rb %%WWWDIR%%/spec/support/db_cleaner.rb +%%WWWDIR%%/spec/support/external_authorization_service_helpers.rb %%WWWDIR%%/spec/support/features/discussion_comments_shared_example.rb -%%WWWDIR%%/spec/support/features/issuable_quick_actions_shared_examples.rb %%WWWDIR%%/spec/support/features/reportable_note_shared_examples.rb %%WWWDIR%%/spec/support/features/resolving_discussions_in_issues_shared_examples.rb %%WWWDIR%%/spec/support/features/rss_shared_examples.rb @@ -15484,6 +15790,7 @@ %%WWWDIR%%/spec/support/helpers/key_generator_helper.rb %%WWWDIR%%/spec/support/helpers/kubernetes_helpers.rb %%WWWDIR%%/spec/support/helpers/ldap_helpers.rb +%%WWWDIR%%/spec/support/helpers/license_helper.rb %%WWWDIR%%/spec/support/helpers/live_debugger.rb %%WWWDIR%%/spec/support/helpers/login_helpers.rb %%WWWDIR%%/spec/support/helpers/markdown_feature.rb @@ -15493,6 +15800,7 @@ %%WWWDIR%%/spec/support/helpers/mobile_helpers.rb %%WWWDIR%%/spec/support/helpers/note_interaction_helpers.rb %%WWWDIR%%/spec/support/helpers/notification_helpers.rb +%%WWWDIR%%/spec/support/helpers/policy_helpers.rb %%WWWDIR%%/spec/support/helpers/project_forks_helper.rb %%WWWDIR%%/spec/support/helpers/prometheus_helpers.rb %%WWWDIR%%/spec/support/helpers/query_recorder.rb @@ -15516,6 +15824,7 @@ %%WWWDIR%%/spec/support/helpers/stub_gitlab_data.rb %%WWWDIR%%/spec/support/helpers/stub_metrics.rb %%WWWDIR%%/spec/support/helpers/stub_object_storage.rb +%%WWWDIR%%/spec/support/helpers/stub_worker.rb %%WWWDIR%%/spec/support/helpers/terms_helper.rb %%WWWDIR%%/spec/support/helpers/test_env.rb %%WWWDIR%%/spec/support/helpers/test_request_helpers.rb @@ -15564,7 +15873,6 @@ %%WWWDIR%%/spec/support/migrations_helpers/cluster_helpers.rb %%WWWDIR%%/spec/support/migrations_helpers/track_untracked_uploads_helpers.rb %%WWWDIR%%/spec/support/omni_auth.rb -%%WWWDIR%%/spec/support/pg_stat_activity.rb %%WWWDIR%%/spec/support/prepare-gitlab-git-test-for-commit %%WWWDIR%%/spec/support/prometheus/additional_metrics_shared_examples.rb %%WWWDIR%%/spec/support/prometheus/metric_builders.rb @@ -15578,15 +15886,23 @@ %%WWWDIR%%/spec/support/services/issuable_update_service_shared_examples.rb %%WWWDIR%%/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb %%WWWDIR%%/spec/support/setup_builds_storage.rb +%%WWWDIR%%/spec/support/shared_context/policies/project_policy_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/change_access_checks_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/email_shared_context.rb +%%WWWDIR%%/spec/support/shared_contexts/finders/group_projects_finder_shared_contexts.rb +%%WWWDIR%%/spec/support/shared_contexts/finders/issues_finder_shared_contexts.rb +%%WWWDIR%%/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb +%%WWWDIR%%/spec/support/shared_contexts/finders/users_finder_shared_contexts.rb %%WWWDIR%%/spec/support/shared_contexts/json_response_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/merge_requests_allowing_collaboration.rb +%%WWWDIR%%/spec/support/shared_contexts/policies/group_policy_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/services_shared_context.rb %%WWWDIR%%/spec/support/shared_contexts/url_shared_context.rb +%%WWWDIR%%/spec/support/shared_examples/application_setting_examples.rb %%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/external_authorization_service_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/issuable_notes_filter_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/repository_lfs_file_load_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/set_sort_order_from_user_preference_shared_examples.rb @@ -15607,6 +15923,7 @@ %%WWWDIR%%/spec/support/shared_examples/features/protected_branches_access_control_ce.rb %%WWWDIR%%/spec/support/shared_examples/features/search_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/file_finder.rb +%%WWWDIR%%/spec/support/shared_examples/finders/finder_with_external_authorization_enabled.rb %%WWWDIR%%/spec/support/shared_examples/gitlab_verify.rb %%WWWDIR%%/spec/support/shared_examples/graphql/issuable_state_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/group_members_shared_example.rb @@ -15636,20 +15953,57 @@ %%WWWDIR%%/spec/support/shared_examples/models/with_uploads_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/notify_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/policies/clusterable_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/policies/project_policy_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/position_formatters.rb %%WWWDIR%%/spec/support/shared_examples/project_list_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/commit/tag_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/assign_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/award_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/close_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/copy_metadata_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/done_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/estimate_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/label_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/lock_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/milestone_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/relabel_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/remove_estimate_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/remove_milestone_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/remove_time_spent_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/reopen_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/shrug_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/spend_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/subscribe_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/tableflip_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/time_tracking_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/title_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/todo_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/unassign_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/unlabel_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/unlock_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/unsubscribe_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/board_move_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/confidential_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/create_merge_request_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/due_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/duplicate_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/remove_due_date_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/merge_request/target_branch_quick_action_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/quick_actions/merge_request/wip_quick_action_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/reference_parser_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/requests/api/diff_discussions.rb %%WWWDIR%%/spec/support/shared_examples/requests/api/discussions.rb %%WWWDIR%%/spec/support/shared_examples/requests/api/issuable_participants_examples.rb -%%WWWDIR%%/spec/support/shared_examples/requests/api/merge_requests_list.rb %%WWWDIR%%/spec/support/shared_examples/requests/api/notes.rb %%WWWDIR%%/spec/support/shared_examples/requests/api/resolvable_discussions.rb %%WWWDIR%%/spec/support/shared_examples/requests/api/status_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/requests/graphql_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/serializers/diff_file_entity_examples.rb %%WWWDIR%%/spec/support/shared_examples/serializers/note_entity_examples.rb +%%WWWDIR%%/spec/support/shared_examples/services/base_helm_service_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/services/boards/boards_create_service.rb %%WWWDIR%%/spec/support/shared_examples/services/boards/boards_list_service.rb %%WWWDIR%%/spec/support/shared_examples/services/boards/issues_list_service.rb @@ -15661,11 +16015,10 @@ %%WWWDIR%%/spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/showing_user_status_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb -%%WWWDIR%%/spec/support/shared_examples/snippet_visibility.rb +%%WWWDIR%%/spec/support/shared_examples/snippet_visibility_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/snippets_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/taskable_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/throttled_touch.rb -%%WWWDIR%%/spec/support/shared_examples/time_tracking_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/unique_ip_check_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/update_invalid_issuable.rb %%WWWDIR%%/spec/support/shared_examples/updating_mentions_shared_examples.rb @@ -15724,6 +16077,7 @@ %%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/devise_email_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 @@ -15731,6 +16085,7 @@ %%WWWDIR%%/spec/validators/sha_validator_spec.rb %%WWWDIR%%/spec/validators/url_validator_spec.rb %%WWWDIR%%/spec/validators/variable_duplicates_validator_spec.rb +%%WWWDIR%%/spec/validators/x509_certificate_credentials_validator_spec.rb %%WWWDIR%%/spec/views/admin/dashboard/index.html.haml_spec.rb %%WWWDIR%%/spec/views/ci/status/_badge.html.haml_spec.rb %%WWWDIR%%/spec/views/ci/status/_icon.html.haml_spec.rb @@ -15739,6 +16094,7 @@ %%WWWDIR%%/spec/views/devise/shared/_signin_box.html.haml_spec.rb %%WWWDIR%%/spec/views/errors/access_denied.html.haml_spec.rb %%WWWDIR%%/spec/views/events/event/_push.html.haml_spec.rb +%%WWWDIR%%/spec/views/groups/_home_panel.html.haml_spec.rb %%WWWDIR%%/spec/views/groups/edit.html.haml_spec.rb %%WWWDIR%%/spec/views/help/index.html.haml_spec.rb %%WWWDIR%%/spec/views/help/instance_configuration.html.haml_spec.rb @@ -15805,9 +16161,11 @@ %%WWWDIR%%/spec/workers/build_trace_sections_worker_spec.rb %%WWWDIR%%/spec/workers/chat_notification_worker_spec.rb %%WWWDIR%%/spec/workers/ci/archive_traces_cron_worker_spec.rb +%%WWWDIR%%/spec/workers/ci/build_prepare_worker_spec.rb %%WWWDIR%%/spec/workers/ci/build_schedule_worker_spec.rb %%WWWDIR%%/spec/workers/cleanup_container_repository_worker_spec.rb %%WWWDIR%%/spec/workers/cluster_configure_worker_spec.rb +%%WWWDIR%%/spec/workers/cluster_project_configure_worker_spec.rb %%WWWDIR%%/spec/workers/cluster_provision_worker_spec.rb %%WWWDIR%%/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb %%WWWDIR%%/spec/workers/concerns/application_worker_spec.rb @@ -15866,6 +16224,7 @@ %%WWWDIR%%/spec/workers/mail_scheduler/issue_due_worker_spec.rb %%WWWDIR%%/spec/workers/mail_scheduler/notification_service_worker_spec.rb %%WWWDIR%%/spec/workers/merge_worker_spec.rb +%%WWWDIR%%/spec/workers/migrate_external_diffs_worker_spec.rb %%WWWDIR%%/spec/workers/namespaceless_project_destroy_worker_spec.rb %%WWWDIR%%/spec/workers/new_issue_worker_spec.rb %%WWWDIR%%/spec/workers/new_merge_request_worker_spec.rb @@ -15909,6 +16268,7 @@ %%WWWDIR%%/spec/workers/repository_remove_remote_worker_spec.rb %%WWWDIR%%/spec/workers/repository_update_remote_mirror_worker_spec.rb %%WWWDIR%%/spec/workers/run_pipeline_schedule_worker_spec.rb +%%WWWDIR%%/spec/workers/schedule_migrate_external_diffs_worker_spec.rb %%WWWDIR%%/spec/workers/stage_update_worker_spec.rb %%WWWDIR%%/spec/workers/stuck_ci_jobs_worker_spec.rb %%WWWDIR%%/spec/workers/stuck_import_jobs_worker_spec.rb @@ -15946,8 +16306,6 @@ %%WWWDIR%%/vendor/Dockerfile/Ruby-alpine.Dockerfile %%WWWDIR%%/vendor/Dockerfile/Ruby.Dockerfile %%WWWDIR%%/vendor/assets/javascripts/jasmine-jquery.js -%%WWWDIR%%/vendor/assets/javascripts/jquery.atwho.js -%%WWWDIR%%/vendor/assets/javascripts/jquery.caret.js %%WWWDIR%%/vendor/assets/javascripts/jquery.endless-scroll.js %%WWWDIR%%/vendor/assets/javascripts/jquery.scrollTo.js %%WWWDIR%%/vendor/assets/javascripts/pdf.js @@ -16054,6 +16412,6 @@ @sample %%WWWDIR%%/lib/support/nginx/gitlab-ssl.sample @owner root @group wheel -@dir /usr/home -@dir(git,git,) /usr/home/git -@dir(git,git,2770) /usr/home/git/repositories +@dir /usr/local +@dir(git,git,) /usr/local/git +@dir(git,git,2770) /usr/local/git/repositories diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 6d2ab712878..1416e3bec49 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-workhorse -PORTVERSION= 8.3.3 +PORTVERSION= 8.5.1 CATEGORIES= www MAINTAINER= mfechner@FreeBSD.org @@ -20,7 +20,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags -GL_COMMIT= 9de4e9f711ccb8ed4b122d4d3a79cc409dcd5ba8 +GL_COMMIT= be9f08059f33f7b4b0fdf42f220b13270680c04b MAKE_JOBS_UNSAFE=yes PLIST_FILES= bin/gitlab-workhorse \ diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 36799f018d8..c2d91f08db3 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554236685 -SHA256 (gitlab-org-gitlab-workhorse-9de4e9f711ccb8ed4b122d4d3a79cc409dcd5ba8_GL0.tar.gz) = 4897cdbae2ac7c94d9094ba1e6860c48afbb58ed857dc92bce936fe6e36b4afd -SIZE (gitlab-org-gitlab-workhorse-9de4e9f711ccb8ed4b122d4d3a79cc409dcd5ba8_GL0.tar.gz) = 2923904 +TIMESTAMP = 1555692915 +SHA256 (gitlab-org-gitlab-workhorse-be9f08059f33f7b4b0fdf42f220b13270680c04b_GL0.tar.gz) = a0f951659602c8cf78aa390826226de62aaafa5c5f0e101089ca5dd1098d3ebe +SIZE (gitlab-org-gitlab-workhorse-be9f08059f33f7b4b0fdf42f220b13270680c04b_GL0.tar.gz) = 2951148 diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile index adc1a638a3c..c183399dd8d 100644 --- a/www/horde-base/Makefile +++ b/www/horde-base/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= horde -PORTVERSION= 5.2.20 +PORTVERSION= 5.2.21 CATEGORIES= www pear PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} diff --git a/www/horde-base/distinfo b/www/horde-base/distinfo index aee71dfb4c0..7478d9ef262 100644 --- a/www/horde-base/distinfo +++ b/www/horde-base/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538073346 -SHA256 (Horde/horde-5.2.20.tgz) = 0417a19b3ff864996023a81173f9748036cdf8b7dbef378bc60f50b839fdb440 -SIZE (Horde/horde-5.2.20.tgz) = 2989979 +TIMESTAMP = 1556102903 +SHA256 (Horde/horde-5.2.21.tgz) = 2e6c0c318cb121d2a87ab97261a650a3685593fc87216566924f640b97187d1a +SIZE (Horde/horde-5.2.21.tgz) = 2989952 diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 7feaa5442e8..4a35c3cea62 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.15.12 +PORTVERSION= 1.16.0 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 3d3d2aa72d5..a88c26d9cc3 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1555463627 -SHA256 (nginx-1.15.12.tar.gz) = 3d5b90aa17de1700709ae4ec6c4d73d87c888b06c510391bf7104b006fdb2abe -SIZE (nginx-1.15.12.tar.gz) = 1032347 +TIMESTAMP = 1556063243 +SHA256 (nginx-1.16.0.tar.gz) = 4fd376bad78797e7f18094a00f0f1088259326436b537eb5af69b01be2ca1345 +SIZE (nginx-1.16.0.tar.gz) = 1032345 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SIZE (ngx_cache_purge-2.3.tar.gz) = 12248 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile index a1a1c614250..118d76d74cc 100644 --- a/www/p5-Apache-DB/Makefile +++ b/www/p5-Apache-DB/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Apache-DB -PORTVERSION= 0.15 +PORTVERSION= 0.16 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-Apache-DB/distinfo b/www/p5-Apache-DB/distinfo index 3ef41cdcaa0..55f9c48cda5 100644 --- a/www/p5-Apache-DB/distinfo +++ b/www/p5-Apache-DB/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554252011 -SHA256 (Apache-DB-0.15.tar.gz) = d54025b7d04b0cd0562d46a8fc620ffd843a6deef0096f3b6b0f4cd5b9a257d1 -SIZE (Apache-DB-0.15.tar.gz) = 9230 +TIMESTAMP = 1556118503 +SHA256 (Apache-DB-0.16.tar.gz) = f037889483d38a75ca8e5e47351f44773f09d4bf0a1f3c9fa4a2b60eff8f2ee6 +SIZE (Apache-DB-0.16.tar.gz) = 117431 diff --git a/www/p5-Apache-DB/pkg-plist b/www/p5-Apache-DB/pkg-plist index 74ee87bd912..062ae59a068 100644 --- a/www/p5-Apache-DB/pkg-plist +++ b/www/p5-Apache-DB/pkg-plist @@ -1,9 +1,9 @@ -%%PERL5_MAN3%%/Apache::DB.3.gz -%%PERL5_MAN3%%/Apache::DProf.3.gz -%%PERL5_MAN3%%/Apache::SmallProf.3.gz -%%PERL5_MAN3%%/Apache::perl5db.3.gz %%SITE_ARCH%%/Apache/DB.pm %%SITE_ARCH%%/Apache/DProf.pm %%SITE_ARCH%%/Apache/SmallProf.pm %%SITE_ARCH%%/Apache/perl5db.pl %%SITE_ARCH%%/auto/Apache/DB/DB.so +%%PERL5_MAN3%%/Apache::DB.3.gz +%%PERL5_MAN3%%/Apache::DProf.3.gz +%%PERL5_MAN3%%/Apache::SmallProf.3.gz +%%PERL5_MAN3%%/Apache::perl5db.3.gz diff --git a/www/p5-HTTP-Simple/Makefile b/www/p5-HTTP-Simple/Makefile new file mode 100644 index 00000000000..8f6ad382a0c --- /dev/null +++ b/www/p5-HTTP-Simple/Makefile @@ -0,0 +1,24 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= HTTP-Simple +PORTVERSION= 0.002 +CATEGORIES= www perl5 +MASTER_SITES= CPAN +PKGNAMEPREFIX= p5- + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Simple procedural interface to HTTP::Tiny + +LICENSE= ART20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL + +USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes + +.include diff --git a/www/p5-HTTP-Simple/distinfo b/www/p5-HTTP-Simple/distinfo new file mode 100644 index 00000000000..0b968cdfb3a --- /dev/null +++ b/www/p5-HTTP-Simple/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1556035811 +SHA256 (HTTP-Simple-0.002.tar.gz) = 2fd86af56b8d70faa29d2b606724fd5264c725c053dc0d665e4438ca03207bab +SIZE (HTTP-Simple-0.002.tar.gz) = 18492 diff --git a/www/p5-HTTP-Simple/pkg-descr b/www/p5-HTTP-Simple/pkg-descr new file mode 100644 index 00000000000..6fba31461ce --- /dev/null +++ b/www/p5-HTTP-Simple/pkg-descr @@ -0,0 +1,19 @@ +HTTP::Simple is a wrapper of HTTP::Tiny that provides simplified functions for +performing HTTP requests in a similar manner to LWP::Simple, but with slightly +more useful error handling. For full control of the request process and response +handling, use HTTP::Tiny directly. + +IO::Socket::SSL is required for HTTPS requests with HTTP::Tiny. + +Request methods that return the body content of the response will return a byte +string suitable for directly printing, but that may need to be decoded for text +operations. + +The HTTP::Tiny object used by these functions to make requests can be accessed +as $HTTP::Simple::UA (for example, to configure the timeout, or replace it with +a compatible object like HTTP::Tinyish). + +The JSON encoder used by the JSON functions defaults to a JSON::PP instance, and +can be accessed as $HTTP::Simple::JSON. + +WWW: https://metacpan.org/release/HTTP-Simple diff --git a/www/p5-HTTP-Simple/pkg-plist b/www/p5-HTTP-Simple/pkg-plist new file mode 100644 index 00000000000..75848d80414 --- /dev/null +++ b/www/p5-HTTP-Simple/pkg-plist @@ -0,0 +1,2 @@ +%%SITE_PERL%%/HTTP/Simple.pm +%%PERL5_MAN3%%/HTTP::Simple.3.gz diff --git a/www/phpvirtualbox/Makefile b/www/phpvirtualbox/Makefile index b8a1b6b028e..25858b96450 100644 --- a/www/phpvirtualbox/Makefile +++ b/www/phpvirtualbox/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= phpvirtualbox -DISTVERSION= 5.2-0 -PORTREVISION= 1 +DISTVERSION= 5.2-1 CATEGORIES= www MAINTAINER= vbox@FreeBSD.org @@ -11,11 +10,12 @@ COMMENT= AJAX Web Interface for VirtualBox LICENSE= GPLv3 -NO_ARCH= yes -NO_BUILD= yes USES= dos2unix php USE_PHP= json session simplexml soap xml +NO_ARCH= yes +NO_BUILD= yes + USE_GITHUB= yes DOS2UNIX_REGEX= .*\.(php|txt|js|css|html) diff --git a/www/phpvirtualbox/distinfo b/www/phpvirtualbox/distinfo index 13035b7e6ae..28c00eb0275 100644 --- a/www/phpvirtualbox/distinfo +++ b/www/phpvirtualbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518995447 -SHA256 (phpvirtualbox-phpvirtualbox-5.2-0_GH0.tar.gz) = 4fc5900a63276a96a6c2e1ce169b630dc5ca78432bd73655d790a624241aad2e -SIZE (phpvirtualbox-phpvirtualbox-5.2-0_GH0.tar.gz) = 3897622 +TIMESTAMP = 1555800469 +SHA256 (phpvirtualbox-phpvirtualbox-5.2-1_GH0.tar.gz) = a7d172dfd9b73f1c8f6ebe5bc98d3ae1fb12395350ac3b932cb811658fc88521 +SIZE (phpvirtualbox-phpvirtualbox-5.2-1_GH0.tar.gz) = 3882921 diff --git a/www/phpvirtualbox/pkg-plist b/www/phpvirtualbox/pkg-plist index 65e240733ef..c8fff093815 100644 --- a/www/phpvirtualbox/pkg-plist +++ b/www/phpvirtualbox/pkg-plist @@ -221,6 +221,7 @@ %%WWWDIR%%/images/vbox/os_linux24_64.png %%WWWDIR%%/images/vbox/os_linux26.png %%WWWDIR%%/images/vbox/os_linux26_64.png +%%WWWDIR%%/images/vbox/os_linux_64.png %%WWWDIR%%/images/vbox/os_linux_other.png %%WWWDIR%%/images/vbox/os_macosx.png %%WWWDIR%%/images/vbox/os_macosx_64.png @@ -259,6 +260,7 @@ %%WWWDIR%%/images/vbox/os_win10_64.png %%WWWDIR%%/images/vbox/os_win2k.png %%WWWDIR%%/images/vbox/os_win2k12_64.png +%%WWWDIR%%/images/vbox/os_win2k16_64.png %%WWWDIR%%/images/vbox/os_win2k3.png %%WWWDIR%%/images/vbox/os_win2k3_64.png %%WWWDIR%%/images/vbox/os_win2k8.png @@ -273,6 +275,7 @@ %%WWWDIR%%/images/vbox/os_win95.png %%WWWDIR%%/images/vbox/os_win98.png %%WWWDIR%%/images/vbox/os_win_other.png +%%WWWDIR%%/images/vbox/os_win_other_64.png %%WWWDIR%%/images/vbox/os_winme.png %%WWWDIR%%/images/vbox/os_winnt4.png %%WWWDIR%%/images/vbox/os_winvista.png diff --git a/www/py-instabot/Makefile b/www/py-instabot/Makefile index 745f807785d..47620095c51 100644 --- a/www/py-instabot/Makefile +++ b/www/py-instabot/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= instabot -PORTVERSION= 0.32.0 +PORTVERSION= 0.33.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-instabot/distinfo b/www/py-instabot/distinfo index 93bc454e8ec..97bded0e6c5 100644 --- a/www/py-instabot/distinfo +++ b/www/py-instabot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555504019 -SHA256 (instabot-0.32.0.tar.gz) = 92fad51168c3119a85a1615ebc44c85246d6ff66ce4757126619474da942f872 -SIZE (instabot-0.32.0.tar.gz) = 54191 +TIMESTAMP = 1556029606 +SHA256 (instabot-0.33.0.tar.gz) = 5f4e24f1dd723493fae49491789db21308a4a411e9e2c0100816fdf968cf2059 +SIZE (instabot-0.33.0.tar.gz) = 54804 diff --git a/www/py-waitress/Makefile b/www/py-waitress/Makefile index b1152375591..5e2e957d7be 100644 --- a/www/py-waitress/Makefile +++ b/www/py-waitress/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= waitress -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-waitress/distinfo b/www/py-waitress/distinfo index a61cf09348b..fda4e5c27f2 100644 --- a/www/py-waitress/distinfo +++ b/www/py-waitress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549565190 -SHA256 (waitress-1.2.1.tar.gz) = c369e238bd81ef7d61f04825f06f107c42094de60d13d8de8e71952c7c683dfe -SIZE (waitress-1.2.1.tar.gz) = 162588 +TIMESTAMP = 1556029612 +SHA256 (waitress-1.3.0.tar.gz) = 4e2a6e6fca56d6d3c279f68a2b2cc9b4798d834ea3c3a9db3e2b76b6d66f4526 +SIZE (waitress-1.3.0.tar.gz) = 163874 diff --git a/www/rubygem-acts-as-taggable-on/Makefile b/www/rubygem-acts-as-taggable-on/Makefile index be11cec6949..311266cf10c 100644 --- a/www/rubygem-acts-as-taggable-on/Makefile +++ b/www/rubygem-acts-as-taggable-on/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= acts-as-taggable-on -PORTVERSION= 5.0.0 -PORTREVISION= 1 +PORTVERSION= 6.0.0 CATEGORIES= www rubygems MASTER_SITES= RG @@ -12,7 +11,7 @@ COMMENT= Tag a single model on several contexts LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-activerecord50>=4.2.8:databases/rubygem-activerecord50 +RUN_DEPENDS= rubygem-activerecord5>=4.2.8:databases/rubygem-activerecord5 USES= gem USE_RUBY= YES diff --git a/www/rubygem-acts-as-taggable-on/distinfo b/www/rubygem-acts-as-taggable-on/distinfo index fe74aef1388..9e0375d3d29 100644 --- a/www/rubygem-acts-as-taggable-on/distinfo +++ b/www/rubygem-acts-as-taggable-on/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525513158 -SHA256 (rubygem/acts-as-taggable-on-5.0.0.gem) = 71d8a997286bc2dc0d0f65b33416e9d52df88ed80c895c6e0f3f626d15856b4f -SIZE (rubygem/acts-as-taggable-on-5.0.0.gem) = 54272 +TIMESTAMP = 1555690774 +SHA256 (rubygem/acts-as-taggable-on-6.0.0.gem) = 74cf948807fdf4d206b85ed79636dd08a08a80c7ae2fcb1b53c37ff7e4158542 +SIZE (rubygem/acts-as-taggable-on-6.0.0.gem) = 53760 diff --git a/www/rubygem-heroku/Makefile b/www/rubygem-heroku/Makefile index fda0ecf380b..5179c9ea4d0 100644 --- a/www/rubygem-heroku/Makefile +++ b/www/rubygem-heroku/Makefile @@ -12,6 +12,9 @@ COMMENT= Heroku Client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +DEPRECATED= Upstream has changed to node-based CLI (https://cli.heroku.com/) +EXPIRATION_DATE=2019-05-31 + RUN_DEPENDS= rubygem-heroku-api>=0.4.2:www/rubygem-heroku-api \ rubygem-launchy>=2.4.3:devel/rubygem-launchy \ rubygem-multi_json>=1.11.2:devel/rubygem-multi_json \ diff --git a/www/rubygem-httparty/Makefile b/www/rubygem-httparty/Makefile index a29c0d56b99..4757c5deddf 100644 --- a/www/rubygem-httparty/Makefile +++ b/www/rubygem-httparty/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= httparty -PORTVERSION= 0.16.3 +PORTVERSION= 0.16.4 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-httparty/distinfo b/www/rubygem-httparty/distinfo index f5747661748..0694cae8794 100644 --- a/www/rubygem-httparty/distinfo +++ b/www/rubygem-httparty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542045896 -SHA256 (rubygem/httparty-0.16.3.gem) = 601cfa3ea82dd805a26086c0edc7bd13185d2a3eaf9993dba4eb8e5ffb3db5f6 -SIZE (rubygem/httparty-0.16.3.gem) = 92672 +TIMESTAMP = 1555690839 +SHA256 (rubygem/httparty-0.16.4.gem) = 62c89d00f5e8933b2d397a49b57deb18ca18e16cb7d862ee4f53b73228dc3d81 +SIZE (rubygem/httparty-0.16.4.gem) = 91136 diff --git a/www/rubygem-jquery-atwho-rails13/Makefile b/www/rubygem-jquery-atwho-rails13/Makefile deleted file mode 100644 index 69b95184178..00000000000 --- a/www/rubygem-jquery-atwho-rails13/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -PORTNAME= jquery-atwho-rails -PORTVERSION= 1.3.2 -CATEGORIES= www rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 13 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= jQuery plugin that implements GitHub-like mentions - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE-MIT - -PORTSCOUT= limit:^1\.3 - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -.include diff --git a/www/rubygem-jquery-atwho-rails13/distinfo b/www/rubygem-jquery-atwho-rails13/distinfo deleted file mode 100644 index aa6f8de2aee..00000000000 --- a/www/rubygem-jquery-atwho-rails13/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1518179054 -SHA256 (rubygem/jquery-atwho-rails-1.3.2.gem) = 899ba0a2c7bca6d0be192ff9056994c79e991e530243604b4424fad6581a023d -SIZE (rubygem/jquery-atwho-rails-1.3.2.gem) = 20480 diff --git a/www/rubygem-jquery-atwho-rails13/pkg-descr b/www/rubygem-jquery-atwho-rails13/pkg-descr deleted file mode 100644 index 3d9d8254a78..00000000000 --- a/www/rubygem-jquery-atwho-rails13/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a jQuery plugin that implement Github-like mentions. - -WWW: https://github.com/ichord/jquery-atwho-rails diff --git a/www/rubygem-rack/Makefile b/www/rubygem-rack/Makefile index b70cb392bf4..7ef1f9027a6 100644 --- a/www/rubygem-rack/Makefile +++ b/www/rubygem-rack/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rack -PORTVERSION= 2.0.6 +PORTVERSION= 2.0.7 PORTEPOCH= 3 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-rack/distinfo b/www/rubygem-rack/distinfo index 5cf09bc5830..acbba7d5073 100644 --- a/www/rubygem-rack/distinfo +++ b/www/rubygem-rack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541520821 -SHA256 (rubygem/rack-2.0.6.gem) = f5874ac9c2223ecc65fcad3120c884fc2a868c1c18f548ff676a6eb21bda8fdd -SIZE (rubygem/rack-2.0.6.gem) = 255488 +TIMESTAMP = 1555690615 +SHA256 (rubygem/rack-2.0.7.gem) = 5158fb64313c17fb2535c8e5def3de7e8b38baf2ab9e4c90155ebed5a9db207d +SIZE (rubygem/rack-2.0.7.gem) = 254976 diff --git a/www/rubygem-select2-rails3/Makefile b/www/rubygem-select2-rails3/Makefile deleted file mode 100644 index 5295170b54e..00000000000 --- a/www/rubygem-select2-rails3/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -PORTNAME= select2-rails -PORTVERSION= 3.5.10 -CATEGORIES= www rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 3 - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Implement select2 jQuery library into Rails - -LICENSE= MIT - -RUN_DEPENDS= rubygem-thor>=0.14:devel/rubygem-thor - -PORTSCOUT= limit:^3\. - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -.include diff --git a/www/rubygem-select2-rails3/distinfo b/www/rubygem-select2-rails3/distinfo deleted file mode 100644 index c1cf418f4cd..00000000000 --- a/www/rubygem-select2-rails3/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1488214710 -SHA256 (rubygem/select2-rails-3.5.10.gem) = 54d76abe9191999e59ce1533fce288ad080e2f2fa9a55351bf6a9d94ed50f251 -SIZE (rubygem/select2-rails-3.5.10.gem) = 59392 diff --git a/www/rubygem-select2-rails3/pkg-descr b/www/rubygem-select2-rails3/pkg-descr deleted file mode 100644 index 89e0251c06a..00000000000 --- a/www/rubygem-select2-rails3/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Select2 is a jQuery based replacement for select boxes. It supports searching, -remote data sets, and infinite scrolling of results. This gem integrates -Select2 with Rails asset pipeline for easy of use. - -WWW: https://github.com/argerim/select2-rails diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile index fa0c5261b58..c3adbdc0370 100644 --- a/www/youtube_dl/Makefile +++ b/www/youtube_dl/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= youtube_dl -PORTVERSION= 2019.04.07 +PORTVERSION= 2019.04.24 CATEGORIES= www MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/ DISTNAME= youtube-dl-${PORTVERSION} diff --git a/www/youtube_dl/distinfo b/www/youtube_dl/distinfo index 9966598ceb6..d2b0aaf1314 100644 --- a/www/youtube_dl/distinfo +++ b/www/youtube_dl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555242385 -SHA256 (youtube-dl-2019.04.07.tar.gz) = 33854099570baccc536f3a51e7196b572294bcd8b6218d13be58dd6f91273dcf -SIZE (youtube-dl-2019.04.07.tar.gz) = 3139592 +TIMESTAMP = 1556118471 +SHA256 (youtube-dl-2019.04.24.tar.gz) = 1fbf54fb2f1ba3050da0cefe3cfa23604d445c8dc944202caf281d83851fffcf +SIZE (youtube-dl-2019.04.24.tar.gz) = 3152789 diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile index 7357362253b..8910705050c 100644 --- a/x11-fm/caja/Makefile +++ b/x11-fm/caja/Makefile @@ -11,10 +11,10 @@ DIST_SUBDIR= mate MAINTAINER= gnome@FreeBSD.org COMMENT?= File manager for the MATE desktop -LICENSE= GPLv2 LGPL20 +LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi -LICENSE_GPLv2_FILE= ${WRKSRC}/COPYING -LICENSE_LGPL20_FILE= ${WRKSRC}/COPYING.LIB +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING +LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libexif.so:graphics/libexif \ libexempi.so:textproc/exempi \ diff --git a/x11-fm/caja/pkg-descr b/x11-fm/caja/pkg-descr index 69e0fa9fd46..59ceb8b3ca9 100644 --- a/x11-fm/caja/pkg-descr +++ b/x11-fm/caja/pkg-descr @@ -2,4 +2,4 @@ Caja (mate-file-manager) is a file manager tightly integrated into the MATE destkop.It is also responsible for desktop and icon management, and provides an intuitive interface for accessing files and webpages. -WWW: http://mate-desktop.org/ +WWW: https://mate-desktop.org/ diff --git a/x11-themes/plata-theme/Makefile b/x11-themes/plata-theme/Makefile index b092c7b5ccc..e0d1cce7821 100644 --- a/x11-themes/plata-theme/Makefile +++ b/x11-themes/plata-theme/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= plata-theme -PORTVERSION= 0.7.7 +PORTVERSION= 0.7.8 CATEGORIES= x11-themes MAINTAINER= tagattie@yandex.com @@ -23,7 +23,7 @@ USES= autoreconf gmake gnome pkgconfig shebangfix USE_GITLAB= yes GL_SITE= https://gitlab.com GL_ACCOUNT= tista500 -GL_COMMIT= 4d938aa71ae5b6e93ea22b1fcfcd62c5026f3034 +GL_COMMIT= 349880a33caf4f271c8a85d906acbc305ee65fc9 NO_ARCH= yes diff --git a/x11-themes/plata-theme/distinfo b/x11-themes/plata-theme/distinfo index 5e8a73a0a1b..b8f76e1b638 100644 --- a/x11-themes/plata-theme/distinfo +++ b/x11-themes/plata-theme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555659164 -SHA256 (tista500-plata-theme-4d938aa71ae5b6e93ea22b1fcfcd62c5026f3034_GL0.tar.gz) = 2f8be65460423379e8d562598c3583d4869b04034199bab0f7995c76e572479d -SIZE (tista500-plata-theme-4d938aa71ae5b6e93ea22b1fcfcd62c5026f3034_GL0.tar.gz) = 437927 +TIMESTAMP = 1556011263 +SHA256 (tista500-plata-theme-349880a33caf4f271c8a85d906acbc305ee65fc9_GL0.tar.gz) = 556916bf16ceed2732463c7caccb285f68a2528c8062c326abf5c182f5da3cd2 +SIZE (tista500-plata-theme-349880a33caf4f271c8a85d906acbc305ee65fc9_GL0.tar.gz) = 440371 diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index cd654433731..2868b606572 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= alacritty -PORTVERSION= 0.3.0 +PORTVERSION= 0.3.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= x11 -MAINTAINER= zeising@FreeBSD.org +MAINTAINER= tobik@FreeBSD.org COMMENT= GPU-accelerated terminal emulator LICENSE= APACHE20 @@ -40,9 +39,8 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ android_glue-0.2.3 \ ansi_term-0.11.0 \ approx-0.3.2 \ - arc-swap-0.3.9 \ + arc-swap-0.3.11 \ argon2rs-0.2.5 \ - arraydeque-0.4.5 \ arrayvec-0.4.10 \ atty-0.2.11 \ autocfg-0.1.2 \ @@ -59,7 +57,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ bytes-0.4.12 \ bzip2-0.3.3 \ bzip2-sys-0.1.7 \ - cc-1.0.34 \ + cc-1.0.35 \ cexpr-0.2.3 \ cfg-if-0.1.7 \ cgl-0.2.3 \ @@ -72,6 +70,8 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ cocoa-0.18.4 \ color_quant-1.0.1 \ constant_time_eq-0.1.3 \ + cookie-0.11.0 \ + cookie_store-0.5.1 \ core-foundation-0.5.1 \ core-foundation-0.6.4 \ core-foundation-sys-0.5.1 \ @@ -94,7 +94,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ derivative-1.0.2 \ dirs-1.0.5 \ dlib-0.4.1 \ - downcast-rs-1.0.3 \ + downcast-rs-1.0.4 \ dtoa-0.4.3 \ dunce-1.0.0 \ either-1.5.2 \ @@ -104,7 +104,8 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ env_logger-0.6.1 \ errno-0.2.4 \ errno-dragonfly-0.1.1 \ - euclid-0.19.7 \ + error-chain-0.12.0 \ + euclid-0.19.8 \ euclid_macros-0.1.0 \ expat-sys-2.1.6 \ failure-0.1.5 \ @@ -114,10 +115,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ fnv-1.0.6 \ font-loader-0.8.0 \ foreign-types-0.3.2 \ - foreign-types-0.4.0 \ - foreign-types-macros-0.1.0 \ foreign-types-shared-0.1.1 \ - foreign-types-shared-0.2.0 \ freetype-rs-0.19.1 \ freetype-sys-0.7.1 \ fsevent-0.2.17 \ @@ -129,24 +127,23 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ futures-cpupool-0.1.8 \ gcc-0.3.55 \ gif-0.10.1 \ - gl_generator-0.10.0 \ gl_generator-0.11.0 \ gleam-0.6.16 \ glob-0.2.11 \ - glutin-0.21.0-rc1 \ - glutin_egl_sys-0.1.2 \ + glutin-0.21.0 \ + glutin_egl_sys-0.1.3 \ glutin_emscripten_sys-0.1.0 \ - glutin_gles2_sys-0.1.2 \ - glutin_glx_sys-0.1.3 \ - glutin_wgl_sys-0.1.2 \ - h2-0.1.17 \ + glutin_gles2_sys-0.1.3 \ + glutin_glx_sys-0.1.5 \ + glutin_wgl_sys-0.1.3 \ + h2-0.1.18 \ http-0.1.17 \ httparse-1.3.3 \ humantime-1.2.0 \ - hyper-0.12.25 \ + hyper-0.12.27 \ hyper-tls-0.3.2 \ idna-0.1.5 \ - image-0.21.0 \ + image-0.21.1 \ indexmap-1.0.2 \ inflate-0.4.5 \ inotify-0.6.1 \ @@ -159,7 +156,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ lazy_static-1.3.0 \ lazycell-1.2.1 \ libc-0.2.51 \ - libflate-0.1.21 \ + libflate-0.1.22 \ libloading-0.5.0 \ libz-sys-1.0.25 \ line_drawing-0.7.0 \ @@ -184,7 +181,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ mio-uds-0.6.7 \ miow-0.2.1 \ miow-0.3.3 \ - named_pipe-0.4.1 \ + named_pipe-0.3.0 \ native-tls-0.2.2 \ net2-0.2.33 \ nix-0.13.0 \ @@ -198,6 +195,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ num-rational-0.2.1 \ num-traits-0.2.6 \ num_cpus-1.10.0 \ + numtoa-0.1.0 \ objc-0.2.6 \ objc-foundation-0.1.1 \ objc_id-0.1.1 \ @@ -219,9 +217,10 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ png-0.14.0 \ podio-0.1.6 \ proc-macro2-0.4.27 \ + publicsuffix-1.5.2 \ quick-error-1.2.2 \ quote-0.3.15 \ - quote-0.6.11 \ + quote-0.6.12 \ rand-0.6.5 \ rand_chacha-0.1.1 \ rand_core-0.3.1 \ @@ -235,20 +234,19 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ rayon-1.0.3 \ rayon-core-1.4.1 \ rdrand-0.4.0 \ - redox_syscall-0.1.53 \ + redox_syscall-0.1.54 \ redox_termios-0.1.1 \ redox_users-0.3.0 \ regex-0.2.11 \ - regex-1.1.5 \ + regex-1.1.6 \ regex-syntax-0.5.6 \ regex-syntax-0.6.6 \ remove_dir_all-0.5.1 \ - reqwest-0.9.13 \ - rustc-demangle-0.1.13 \ + reqwest-0.9.15 \ + rustc-demangle-0.1.14 \ rustc_version-0.2.3 \ - rusttype-0.7.5 \ + rusttype-0.7.6 \ ryu-0.2.7 \ - safe-transmute-0.10.1 \ same-file-1.0.4 \ schannel-0.1.15 \ scoped_threadpool-0.1.9 \ @@ -260,7 +258,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ serde-1.0.90 \ serde_derive-1.0.90 \ serde_json-1.0.39 \ - serde_urlencoded-0.5.4 \ + serde_urlencoded-0.5.5 \ serde_yaml-0.8.8 \ servo-fontconfig-0.4.0 \ servo-fontconfig-sys-4.0.7 \ @@ -277,12 +275,12 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ stb_truetype-0.2.6 \ string-0.1.3 \ strsim-0.8.0 \ - syn-0.15.30 \ + syn-0.15.32 \ synstructure-0.10.1 \ tempfile-3.0.7 \ termcolor-1.0.4 \ terminfo-0.6.1 \ - termion-1.5.1 \ + termion-1.5.2 \ textwrap-0.11.0 \ thread_local-0.3.6 \ tiff-0.2.2 \ @@ -298,6 +296,7 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ tokio-timer-0.2.10 \ tokio-trace-core-0.1.0 \ try-lock-0.2.2 \ + try_from-0.3.2 \ ucd-util-0.1.3 \ unicase-1.4.2 \ unicase-2.3.0 \ diff --git a/x11/alacritty/distinfo b/x11/alacritty/distinfo index da267f79c70..4e18a416b73 100644 --- a/x11/alacritty/distinfo +++ b/x11/alacritty/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1554752071 +TIMESTAMP = 1555997281 SHA256 (rust/crates/MacTypes-sys-2.1.0.tar.gz) = eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f SIZE (rust/crates/MacTypes-sys-2.1.0.tar.gz) = 9274 SHA256 (rust/crates/adler32-1.0.3.tar.gz) = 7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c @@ -15,12 +15,10 @@ SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db238 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 SHA256 (rust/crates/approx-0.3.2.tar.gz) = f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3 SIZE (rust/crates/approx-0.3.2.tar.gz) = 14288 -SHA256 (rust/crates/arc-swap-0.3.9.tar.gz) = bcee9b73d8a058eebb0b567fd3687f6761fb232049f92c23bdd2c82b6fe0c0cc -SIZE (rust/crates/arc-swap-0.3.9.tar.gz) = 44082 +SHA256 (rust/crates/arc-swap-0.3.11.tar.gz) = bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841 +SIZE (rust/crates/arc-swap-0.3.11.tar.gz) = 46282 SHA256 (rust/crates/argon2rs-0.2.5.tar.gz) = 3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392 SIZE (rust/crates/argon2rs-0.2.5.tar.gz) = 353096 -SHA256 (rust/crates/arraydeque-0.4.5.tar.gz) = f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8 -SIZE (rust/crates/arraydeque-0.4.5.tar.gz) = 19936 SHA256 (rust/crates/arrayvec-0.4.10.tar.gz) = 92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71 SIZE (rust/crates/arrayvec-0.4.10.tar.gz) = 26133 SHA256 (rust/crates/atty-0.2.11.tar.gz) = 9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652 @@ -53,8 +51,8 @@ SHA256 (rust/crates/bzip2-0.3.3.tar.gz) = 42b7c3cbf0fa9c1b82308d57191728ca0256cb SIZE (rust/crates/bzip2-0.3.3.tar.gz) = 15346 SHA256 (rust/crates/bzip2-sys-0.1.7.tar.gz) = 6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f SIZE (rust/crates/bzip2-sys-0.1.7.tar.gz) = 609563 -SHA256 (rust/crates/cc-1.0.34.tar.gz) = 30f813bf45048a18eda9190fd3c6b78644146056740c43172a5a3699118588fd -SIZE (rust/crates/cc-1.0.34.tar.gz) = 44012 +SHA256 (rust/crates/cc-1.0.35.tar.gz) = 5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83 +SIZE (rust/crates/cc-1.0.35.tar.gz) = 44369 SHA256 (rust/crates/cexpr-0.2.3.tar.gz) = 42aac45e9567d97474a834efdee3081b3c942b2205be932092f53354ce503d6c SIZE (rust/crates/cexpr-0.2.3.tar.gz) = 15747 SHA256 (rust/crates/cfg-if-0.1.7.tar.gz) = 11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4 @@ -79,6 +77,10 @@ SHA256 (rust/crates/color_quant-1.0.1.tar.gz) = 0dbbb57365263e881e805dc77d94697c SIZE (rust/crates/color_quant-1.0.1.tar.gz) = 5702 SHA256 (rust/crates/constant_time_eq-0.1.3.tar.gz) = 8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e SIZE (rust/crates/constant_time_eq-0.1.3.tar.gz) = 1279 +SHA256 (rust/crates/cookie-0.11.0.tar.gz) = 1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf +SIZE (rust/crates/cookie-0.11.0.tar.gz) = 25906 +SHA256 (rust/crates/cookie_store-0.5.1.tar.gz) = b0d2f2ecb21dce00e2453268370312978af9b8024020c7a37ae2cc6dbbe64685 +SIZE (rust/crates/cookie_store-0.5.1.tar.gz) = 25071 SHA256 (rust/crates/core-foundation-0.5.1.tar.gz) = 286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980 SIZE (rust/crates/core-foundation-0.5.1.tar.gz) = 22519 SHA256 (rust/crates/core-foundation-0.6.4.tar.gz) = 25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d @@ -123,8 +125,8 @@ SHA256 (rust/crates/dirs-1.0.5.tar.gz) = 3fd78930633bd1c6e35c4b42b1df7b0cbc6bc19 SIZE (rust/crates/dirs-1.0.5.tar.gz) = 12908 SHA256 (rust/crates/dlib-0.4.1.tar.gz) = 77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a SIZE (rust/crates/dlib-0.4.1.tar.gz) = 3761 -SHA256 (rust/crates/downcast-rs-1.0.3.tar.gz) = 18df8ce4470c189d18aa926022da57544f31e154631eb4cfe796aea97051fe6c -SIZE (rust/crates/downcast-rs-1.0.3.tar.gz) = 9272 +SHA256 (rust/crates/downcast-rs-1.0.4.tar.gz) = f2b92dfd5c2f75260cbf750572f95d387e7ca0ba5e3fbe9e1a33f23025be020f +SIZE (rust/crates/downcast-rs-1.0.4.tar.gz) = 9611 SHA256 (rust/crates/dtoa-0.4.3.tar.gz) = 6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd SIZE (rust/crates/dtoa-0.4.3.tar.gz) = 14456 SHA256 (rust/crates/dunce-1.0.0.tar.gz) = d0ad6bf6a88548d1126045c413548df1453d9be094a8ab9fd59bf1fdd338da4f @@ -143,8 +145,10 @@ SHA256 (rust/crates/errno-0.2.4.tar.gz) = c2a071601ed01b988f896ab14b95e67335d1ee SIZE (rust/crates/errno-0.2.4.tar.gz) = 8486 SHA256 (rust/crates/errno-dragonfly-0.1.1.tar.gz) = 14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067 SIZE (rust/crates/errno-dragonfly-0.1.1.tar.gz) = 1370 -SHA256 (rust/crates/euclid-0.19.7.tar.gz) = 6a8acd6a7f2740b7b936008acd58b1def492854254dc4af9d2b850ca01f4960e -SIZE (rust/crates/euclid-0.19.7.tar.gz) = 57028 +SHA256 (rust/crates/error-chain-0.12.0.tar.gz) = 07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02 +SIZE (rust/crates/error-chain-0.12.0.tar.gz) = 27056 +SHA256 (rust/crates/euclid-0.19.8.tar.gz) = 7a4719a544a67ed3fc33784c2bd2c6581663dfe83b719a6ae05c6dabc3b51c73 +SIZE (rust/crates/euclid-0.19.8.tar.gz) = 57229 SHA256 (rust/crates/euclid_macros-0.1.0.tar.gz) = fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15 SIZE (rust/crates/euclid_macros-0.1.0.tar.gz) = 7196 SHA256 (rust/crates/expat-sys-2.1.6.tar.gz) = 658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa @@ -163,14 +167,8 @@ SHA256 (rust/crates/font-loader-0.8.0.tar.gz) = 4ece0e8a5dd99a65f8de977b4a3f89e3 SIZE (rust/crates/font-loader-0.8.0.tar.gz) = 7145 SHA256 (rust/crates/foreign-types-0.3.2.tar.gz) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1 SIZE (rust/crates/foreign-types-0.3.2.tar.gz) = 7504 -SHA256 (rust/crates/foreign-types-0.4.0.tar.gz) = 3684708dacd3b83f4bbe6506d4ccb08bed3c16f521d34366f131b9ecd1884431 -SIZE (rust/crates/foreign-types-0.4.0.tar.gz) = 7787 -SHA256 (rust/crates/foreign-types-macros-0.1.0.tar.gz) = 66626064d64b429efe601d7aabd7b0a9721b2611548ca684e78c4ecde48bd29b -SIZE (rust/crates/foreign-types-macros-0.1.0.tar.gz) = 7656 SHA256 (rust/crates/foreign-types-shared-0.1.1.tar.gz) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b SIZE (rust/crates/foreign-types-shared-0.1.1.tar.gz) = 5672 -SHA256 (rust/crates/foreign-types-shared-0.2.0.tar.gz) = c61f9b85573bf0f203eed3633f5018abce85250886a62ca073e0eee022ed564d -SIZE (rust/crates/foreign-types-shared-0.2.0.tar.gz) = 5833 SHA256 (rust/crates/freetype-rs-0.19.1.tar.gz) = 28cc92a7040ee7b631e4279e263f9a83aedc1eb6085c68d8ca4d072b5644e705 SIZE (rust/crates/freetype-rs-0.19.1.tar.gz) = 103875 SHA256 (rust/crates/freetype-sys-0.7.1.tar.gz) = 0f9c8666cce7cf6e51a290623647febfbab92480b4c3e0f495cb9d4d312b5d38 @@ -193,42 +191,40 @@ SHA256 (rust/crates/gcc-0.3.55.tar.gz) = 8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d SIZE (rust/crates/gcc-0.3.55.tar.gz) = 37262 SHA256 (rust/crates/gif-0.10.1.tar.gz) = dd4bca55ac1f213920ce3527ccd62386f1f15fa3f1714aeee1cf93f2c416903f SIZE (rust/crates/gif-0.10.1.tar.gz) = 25076 -SHA256 (rust/crates/gl_generator-0.10.0.tar.gz) = a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604 -SIZE (rust/crates/gl_generator-0.10.0.tar.gz) = 21885 SHA256 (rust/crates/gl_generator-0.11.0.tar.gz) = 39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd SIZE (rust/crates/gl_generator-0.11.0.tar.gz) = 22189 SHA256 (rust/crates/gleam-0.6.16.tar.gz) = 39bb69499005e11b7b7cc0af38404a1bc0f53d954bffa8adcdb6e8d5b14f75d5 SIZE (rust/crates/gleam-0.6.16.tar.gz) = 26363 SHA256 (rust/crates/glob-0.2.11.tar.gz) = 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb SIZE (rust/crates/glob-0.2.11.tar.gz) = 18065 -SHA256 (rust/crates/glutin-0.21.0-rc1.tar.gz) = 575aa103046461547a41351fdf8705a045b4874d0fb26fadbfa3df50fc796b2f -SIZE (rust/crates/glutin-0.21.0-rc1.tar.gz) = 52055 -SHA256 (rust/crates/glutin_egl_sys-0.1.2.tar.gz) = 55294554b495063a8dc641bffb657e3e6f21f3829a5dfcbdb1a80787dbb9f6ca -SIZE (rust/crates/glutin_egl_sys-0.1.2.tar.gz) = 1948 +SHA256 (rust/crates/glutin-0.21.0.tar.gz) = cb26027a84c3b9e1949ef0df0b6a3db8d0c124243a5c161ea25c7def90cb1474 +SIZE (rust/crates/glutin-0.21.0.tar.gz) = 52257 +SHA256 (rust/crates/glutin_egl_sys-0.1.3.tar.gz) = 23f48987ab6cb2b61ad903b59e54a2fd0c380a7baff68cffd6826b69a73dd326 +SIZE (rust/crates/glutin_egl_sys-0.1.3.tar.gz) = 1924 SHA256 (rust/crates/glutin_emscripten_sys-0.1.0.tar.gz) = 245b3fdb08df6ffed7585365851f8404af9c7e2dd4b59f15262e968b6a95a0c7 SIZE (rust/crates/glutin_emscripten_sys-0.1.0.tar.gz) = 1882 -SHA256 (rust/crates/glutin_gles2_sys-0.1.2.tar.gz) = b33e192f35b6f76ad3efb2ddf2184a1ff17106c42f11269f66151ba3036996a8 -SIZE (rust/crates/glutin_gles2_sys-0.1.2.tar.gz) = 2113 -SHA256 (rust/crates/glutin_glx_sys-0.1.3.tar.gz) = 28e9e7abe70853eb96f358e5db642377aa084f7b0f1e8d9e1c232c2fd823b6d7 -SIZE (rust/crates/glutin_glx_sys-0.1.3.tar.gz) = 1703 -SHA256 (rust/crates/glutin_wgl_sys-0.1.2.tar.gz) = 2d0f023d00cfb4a100f6af038c9d03e182daa328796a915b56b0d69942066c8d -SIZE (rust/crates/glutin_wgl_sys-0.1.2.tar.gz) = 1575 -SHA256 (rust/crates/h2-0.1.17.tar.gz) = 910a5e7be6283a9c91b3982fa5188368c8719cce2a3cf3b86048673bf9d9c36b -SIZE (rust/crates/h2-0.1.17.tar.gz) = 142819 +SHA256 (rust/crates/glutin_gles2_sys-0.1.3.tar.gz) = 89996c30857ae1b4de4b5189abf1ea822a20a9fe9e1c93e5e7b862ff0bdd5cdf +SIZE (rust/crates/glutin_gles2_sys-0.1.3.tar.gz) = 2102 +SHA256 (rust/crates/glutin_glx_sys-0.1.5.tar.gz) = 1290a5ca5e46fcfa7f66f949cc9d9194b2cb6f2ed61892c8c2b82343631dba57 +SIZE (rust/crates/glutin_glx_sys-0.1.5.tar.gz) = 1701 +SHA256 (rust/crates/glutin_wgl_sys-0.1.3.tar.gz) = f801bbc91efc22dd1c4818a47814fc72bf74d024510451b119381579bfa39021 +SIZE (rust/crates/glutin_wgl_sys-0.1.3.tar.gz) = 1555 +SHA256 (rust/crates/h2-0.1.18.tar.gz) = 85ab6286db06040ddefb71641b50017c06874614001a134b423783e2db2920bd +SIZE (rust/crates/h2-0.1.18.tar.gz) = 143024 SHA256 (rust/crates/http-0.1.17.tar.gz) = eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a SIZE (rust/crates/http-0.1.17.tar.gz) = 98437 SHA256 (rust/crates/httparse-1.3.3.tar.gz) = e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83 SIZE (rust/crates/httparse-1.3.3.tar.gz) = 23689 SHA256 (rust/crates/humantime-1.2.0.tar.gz) = 3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114 SIZE (rust/crates/humantime-1.2.0.tar.gz) = 16795 -SHA256 (rust/crates/hyper-0.12.25.tar.gz) = 7d5b6658b016965ae301fa995306db965c93677880ea70765a84235a96eae896 -SIZE (rust/crates/hyper-0.12.25.tar.gz) = 116748 +SHA256 (rust/crates/hyper-0.12.27.tar.gz) = 4f2777434f26af6e4ce4fdcdccd3bed9d861d11e87bcbe72c0f51ddaca8ff848 +SIZE (rust/crates/hyper-0.12.27.tar.gz) = 117953 SHA256 (rust/crates/hyper-tls-0.3.2.tar.gz) = 3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f SIZE (rust/crates/hyper-tls-0.3.2.tar.gz) = 8901 SHA256 (rust/crates/idna-0.1.5.tar.gz) = 38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e SIZE (rust/crates/idna-0.1.5.tar.gz) = 258735 -SHA256 (rust/crates/image-0.21.0.tar.gz) = 52fb0666a1273dac46f9725aa4859bcd5595fc3554cf3495051b4de8db745e7d -SIZE (rust/crates/image-0.21.0.tar.gz) = 126260 +SHA256 (rust/crates/image-0.21.1.tar.gz) = 293e54ce142a936a39da748ba8178ae6aa1914b82d846a4278f11590c89bf116 +SIZE (rust/crates/image-0.21.1.tar.gz) = 140858 SHA256 (rust/crates/indexmap-1.0.2.tar.gz) = 7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d SIZE (rust/crates/indexmap-1.0.2.tar.gz) = 38255 SHA256 (rust/crates/inflate-0.4.5.tar.gz) = 1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff @@ -253,8 +249,8 @@ SHA256 (rust/crates/lazycell-1.2.1.tar.gz) = b294d6fa9ee409a054354afc4352b0b9ef7 SIZE (rust/crates/lazycell-1.2.1.tar.gz) = 11691 SHA256 (rust/crates/libc-0.2.51.tar.gz) = bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917 SIZE (rust/crates/libc-0.2.51.tar.gz) = 397323 -SHA256 (rust/crates/libflate-0.1.21.tar.gz) = 7346a83e8a2c3958d44d24225d905385dc31fc16e89dffb356c457b278914d20 -SIZE (rust/crates/libflate-0.1.21.tar.gz) = 35830 +SHA256 (rust/crates/libflate-0.1.22.tar.gz) = c52384aeb22d0ce82a10d8ddf35f7fb4717d1b23eac5b94cd38d2050fb53766a +SIZE (rust/crates/libflate-0.1.22.tar.gz) = 35923 SHA256 (rust/crates/libloading-0.5.0.tar.gz) = 9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2 SIZE (rust/crates/libloading-0.5.0.tar.gz) = 15990 SHA256 (rust/crates/libz-sys-1.0.25.tar.gz) = 2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe @@ -303,8 +299,8 @@ SHA256 (rust/crates/miow-0.2.1.tar.gz) = 8c1f2f3b1cf331de6896aabf6e9d55dca90356c SIZE (rust/crates/miow-0.2.1.tar.gz) = 21133 SHA256 (rust/crates/miow-0.3.3.tar.gz) = 396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226 SIZE (rust/crates/miow-0.3.3.tar.gz) = 22850 -SHA256 (rust/crates/named_pipe-0.4.1.tar.gz) = ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b -SIZE (rust/crates/named_pipe-0.4.1.tar.gz) = 13985 +SHA256 (rust/crates/named_pipe-0.3.0.tar.gz) = 8ed10a5ac4f5f7e5d75552b12c1d5d542debca81e573279dd1e4c19fde6efa6d +SIZE (rust/crates/named_pipe-0.3.0.tar.gz) = 12840 SHA256 (rust/crates/native-tls-0.2.2.tar.gz) = ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2 SIZE (rust/crates/native-tls-0.2.2.tar.gz) = 29238 SHA256 (rust/crates/net2-0.2.33.tar.gz) = 42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88 @@ -331,6 +327,8 @@ SHA256 (rust/crates/num-traits-0.2.6.tar.gz) = 0b3a5d7cc97d6d30d8b9bc8fa19bf4534 SIZE (rust/crates/num-traits-0.2.6.tar.gz) = 39923 SHA256 (rust/crates/num_cpus-1.10.0.tar.gz) = 1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba SIZE (rust/crates/num_cpus-1.10.0.tar.gz) = 10669 +SHA256 (rust/crates/numtoa-0.1.0.tar.gz) = b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef +SIZE (rust/crates/numtoa-0.1.0.tar.gz) = 8999 SHA256 (rust/crates/objc-0.2.6.tar.gz) = 31d20fd2b37e07cf5125be68357b588672e8cefe9a96f8c17a9d46053b3e590d SIZE (rust/crates/objc-0.2.6.tar.gz) = 21395 SHA256 (rust/crates/objc-foundation-0.1.1.tar.gz) = 1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9 @@ -373,12 +371,14 @@ SHA256 (rust/crates/podio-0.1.6.tar.gz) = 780fb4b6698bbf9cf2444ea5d22411cef2953f SIZE (rust/crates/podio-0.1.6.tar.gz) = 10186 SHA256 (rust/crates/proc-macro2-0.4.27.tar.gz) = 4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915 SIZE (rust/crates/proc-macro2-0.4.27.tar.gz) = 34098 +SHA256 (rust/crates/publicsuffix-1.5.2.tar.gz) = 5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d +SIZE (rust/crates/publicsuffix-1.5.2.tar.gz) = 16514 SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0 SIZE (rust/crates/quick-error-1.2.2.tar.gz) = 15132 SHA256 (rust/crates/quote-0.3.15.tar.gz) = 7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a SIZE (rust/crates/quote-0.3.15.tar.gz) = 12041 -SHA256 (rust/crates/quote-0.6.11.tar.gz) = cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1 -SIZE (rust/crates/quote-0.6.11.tar.gz) = 17283 +SHA256 (rust/crates/quote-0.6.12.tar.gz) = faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db +SIZE (rust/crates/quote-0.6.12.tar.gz) = 17541 SHA256 (rust/crates/rand-0.6.5.tar.gz) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca SIZE (rust/crates/rand-0.6.5.tar.gz) = 104814 SHA256 (rust/crates/rand_chacha-0.1.1.tar.gz) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef @@ -405,34 +405,32 @@ SHA256 (rust/crates/rayon-core-1.4.1.tar.gz) = b055d1e92aba6877574d8fe604a63c8b5 SIZE (rust/crates/rayon-core-1.4.1.tar.gz) = 53760 SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456 -SHA256 (rust/crates/redox_syscall-0.1.53.tar.gz) = 53848511b7ee6eb9d5c3db48481aaa5779b38fc0131bc133c98cb4f2b2411928 -SIZE (rust/crates/redox_syscall-0.1.53.tar.gz) = 15725 +SHA256 (rust/crates/redox_syscall-0.1.54.tar.gz) = 12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252 +SIZE (rust/crates/redox_syscall-0.1.54.tar.gz) = 15668 SHA256 (rust/crates/redox_termios-0.1.1.tar.gz) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 SIZE (rust/crates/redox_termios-0.1.1.tar.gz) = 3227 SHA256 (rust/crates/redox_users-0.3.0.tar.gz) = 3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828 SIZE (rust/crates/redox_users-0.3.0.tar.gz) = 12766 SHA256 (rust/crates/regex-0.2.11.tar.gz) = 9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384 SIZE (rust/crates/regex-0.2.11.tar.gz) = 209507 -SHA256 (rust/crates/regex-1.1.5.tar.gz) = 559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0 -SIZE (rust/crates/regex-1.1.5.tar.gz) = 243275 +SHA256 (rust/crates/regex-1.1.6.tar.gz) = 8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58 +SIZE (rust/crates/regex-1.1.6.tar.gz) = 243429 SHA256 (rust/crates/regex-syntax-0.5.6.tar.gz) = 7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7 SIZE (rust/crates/regex-syntax-0.5.6.tar.gz) = 233912 SHA256 (rust/crates/regex-syntax-0.6.6.tar.gz) = dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96 SIZE (rust/crates/regex-syntax-0.6.6.tar.gz) = 273068 SHA256 (rust/crates/remove_dir_all-0.5.1.tar.gz) = 3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5 SIZE (rust/crates/remove_dir_all-0.5.1.tar.gz) = 8726 -SHA256 (rust/crates/reqwest-0.9.13.tar.gz) = 3c4ef83e0beb14bfe38b9f01330a5bc8e965a9f9628690aa28383746dac1e925 -SIZE (rust/crates/reqwest-0.9.13.tar.gz) = 78145 -SHA256 (rust/crates/rustc-demangle-0.1.13.tar.gz) = adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619 -SIZE (rust/crates/rustc-demangle-0.1.13.tar.gz) = 11726 +SHA256 (rust/crates/reqwest-0.9.15.tar.gz) = 943b9f85622f53bcf71721e0996f23688e3942e51fc33766c2e24a959316767b +SIZE (rust/crates/reqwest-0.9.15.tar.gz) = 83521 +SHA256 (rust/crates/rustc-demangle-0.1.14.tar.gz) = ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288 +SIZE (rust/crates/rustc-demangle-0.1.14.tar.gz) = 18721 SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a SIZE (rust/crates/rustc_version-0.2.3.tar.gz) = 10210 -SHA256 (rust/crates/rusttype-0.7.5.tar.gz) = ce3926a2057b315b3e8bca6d1cec1e97f19436a8f9127621cd538cda9c96a38b -SIZE (rust/crates/rusttype-0.7.5.tar.gz) = 58151 +SHA256 (rust/crates/rusttype-0.7.6.tar.gz) = 25951e85bb2647960969f72c559392245a5bd07446a589390bf427dda31cdc4a +SIZE (rust/crates/rusttype-0.7.6.tar.gz) = 57965 SHA256 (rust/crates/ryu-0.2.7.tar.gz) = eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7 SIZE (rust/crates/ryu-0.2.7.tar.gz) = 41382 -SHA256 (rust/crates/safe-transmute-0.10.1.tar.gz) = 9604873ffe1980bc1f179103704a65c8aca141c248d9e52b7af95ff10578166e -SIZE (rust/crates/safe-transmute-0.10.1.tar.gz) = 14891 SHA256 (rust/crates/same-file-1.0.4.tar.gz) = 8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267 SIZE (rust/crates/same-file-1.0.4.tar.gz) = 8678 SHA256 (rust/crates/schannel-0.1.15.tar.gz) = f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339 @@ -455,8 +453,8 @@ SHA256 (rust/crates/serde_derive-1.0.90.tar.gz) = 58fc82bec244f168b23d1963b45c8b SIZE (rust/crates/serde_derive-1.0.90.tar.gz) = 48815 SHA256 (rust/crates/serde_json-1.0.39.tar.gz) = 5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d SIZE (rust/crates/serde_json-1.0.39.tar.gz) = 69621 -SHA256 (rust/crates/serde_urlencoded-0.5.4.tar.gz) = d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2 -SIZE (rust/crates/serde_urlencoded-0.5.4.tar.gz) = 12552 +SHA256 (rust/crates/serde_urlencoded-0.5.5.tar.gz) = 642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a +SIZE (rust/crates/serde_urlencoded-0.5.5.tar.gz) = 12429 SHA256 (rust/crates/serde_yaml-0.8.8.tar.gz) = 0887a8e097a69559b56aa2526bf7aff7c3048cf627dff781f0b56a6001534593 SIZE (rust/crates/serde_yaml-0.8.8.tar.gz) = 35882 SHA256 (rust/crates/servo-fontconfig-0.4.0.tar.gz) = a088f8d775a5c5314aae09bd77340bc9c67d72b9a45258be34c83548b4814cd9 @@ -489,8 +487,8 @@ SHA256 (rust/crates/string-0.1.3.tar.gz) = b639411d0b9c738748b5397d5ceba08e648f4 SIZE (rust/crates/string-0.1.3.tar.gz) = 4143 SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309 -SHA256 (rust/crates/syn-0.15.30.tar.gz) = 66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2 -SIZE (rust/crates/syn-0.15.30.tar.gz) = 146358 +SHA256 (rust/crates/syn-0.15.32.tar.gz) = 846620ec526c1599c070eff393bfeeeb88a93afa2513fc3b49f1fea84cf7b0ed +SIZE (rust/crates/syn-0.15.32.tar.gz) = 148009 SHA256 (rust/crates/synstructure-0.10.1.tar.gz) = 73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015 SIZE (rust/crates/synstructure-0.10.1.tar.gz) = 17836 SHA256 (rust/crates/tempfile-3.0.7.tar.gz) = b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a @@ -499,8 +497,8 @@ SHA256 (rust/crates/termcolor-1.0.4.tar.gz) = 4096add70612622289f2fdcdbd5086dc81 SIZE (rust/crates/termcolor-1.0.4.tar.gz) = 14416 SHA256 (rust/crates/terminfo-0.6.1.tar.gz) = 8e51065bafd2abe106b6036483b69d1741f4a1ec56ce8a2378de341637de689e SIZE (rust/crates/terminfo-0.6.1.tar.gz) = 44031 -SHA256 (rust/crates/termion-1.5.1.tar.gz) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 -SIZE (rust/crates/termion-1.5.1.tar.gz) = 20659 +SHA256 (rust/crates/termion-1.5.2.tar.gz) = dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea +SIZE (rust/crates/termion-1.5.2.tar.gz) = 22076 SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322 SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b @@ -531,6 +529,8 @@ SHA256 (rust/crates/tokio-trace-core-0.1.0.tar.gz) = 350c9edade9830dc185ae48ba45 SIZE (rust/crates/tokio-trace-core-0.1.0.tar.gz) = 20087 SHA256 (rust/crates/try-lock-0.2.2.tar.gz) = e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382 SIZE (rust/crates/try-lock-0.2.2.tar.gz) = 3638 +SHA256 (rust/crates/try_from-0.3.2.tar.gz) = 283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b +SIZE (rust/crates/try_from-0.3.2.tar.gz) = 4264 SHA256 (rust/crates/ucd-util-0.1.3.tar.gz) = 535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86 SIZE (rust/crates/ucd-util-0.1.3.tar.gz) = 25897 SHA256 (rust/crates/unicase-1.4.2.tar.gz) = 7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33 @@ -621,5 +621,5 @@ SHA256 (rust/crates/yaml-rust-0.4.3.tar.gz) = 65923dd1784f44da1d2c3dbbc5e8220456 SIZE (rust/crates/yaml-rust-0.4.3.tar.gz) = 45768 SHA256 (rust/crates/zip-0.5.2.tar.gz) = c18fc320faf909036e46ac785ea827f72e485304877faf1a3a39538d3714dbc3 SIZE (rust/crates/zip-0.5.2.tar.gz) = 29522 -SHA256 (jwilm-alacritty-v0.3.0_GH0.tar.gz) = 62f96fa751eb553012dc7e562e62cdf37c6668c8117be31790ce7dc2d4d28a47 -SIZE (jwilm-alacritty-v0.3.0_GH0.tar.gz) = 1332555 +SHA256 (jwilm-alacritty-v0.3.2_GH0.tar.gz) = e2bc5323d505d9d487b2fdfc29f82a77e18b17f92de3988742950471808272f7 +SIZE (jwilm-alacritty-v0.3.2_GH0.tar.gz) = 1341205 diff --git a/x11/bemenu/Makefile b/x11/bemenu/Makefile index 8ea6bb5be9a..7d1e85ca9b0 100644 --- a/x11/bemenu/Makefile +++ b/x11/bemenu/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= bemenu -DISTVERSION= 0.1.0 +DISTVERSION= 0.1.0-11 +DISTVERSIONSUFFIX= -g6cc18e3 CATEGORIES= x11 wayland MAINTAINER= tobik@FreeBSD.org @@ -28,22 +29,21 @@ OPTIONS_SUB= yes BACKEND_DESC= Backend BEMENU_RUN_DESC= Install bemenu-run (not recommended) +NCURSES_CMAKE_BOOL= BEMENU_CURSES_RENDERER NCURSES_CMAKE_ON= -DCURSES_FOUND:BOOL=yes \ -DCURSES_INCLUDE_DIRS:PATH="${NCURSESINC}" \ -DCURSES_LIBRARY:PATH="${NCURSESLIB}/libncursesw.so" NCURSES_USES= ncurses -WAYLAND_CFLAGS= -I${LOCALBASE}/include/libepoll-shim -WAYLAND_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Wayland +WAYLAND_CMAKE_BOOL= BEMENU_WAYLAND_RENDERER WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon -WAYLAND_LDFLAGS= -lepoll-shim -WAYLAND_USES= localbase:ldflags gnome pkgconfig +WAYLAND_USES= gnome pkgconfig WAYLAND_USE= GNOME=cairo,glib20,pango -X11_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_X11 -X11_USES= gnome localbase:ldflags pkgconfig +X11_CMAKE_BOOL= BEMENU_X11_RENDERER +X11_USES= gnome pkgconfig X11_USE= GNOME=cairo,glib20,pango XORG=x11,xinerama .include diff --git a/x11/bemenu/distinfo b/x11/bemenu/distinfo index eb739cdb159..a7959630c94 100644 --- a/x11/bemenu/distinfo +++ b/x11/bemenu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551945398 -SHA256 (Cloudef-bemenu-0.1.0_GH0.tar.gz) = fddc08be9f04efea221841ccc481ed7ae27a6f28438c1f9871939fe71b22559e -SIZE (Cloudef-bemenu-0.1.0_GH0.tar.gz) = 117342 +TIMESTAMP = 1556083947 +SHA256 (Cloudef-bemenu-0.1.0-11-g6cc18e3_GH0.tar.gz) = abd734b01bf3c290b880c46635bacee6c11b464adff5e841ba662406f5045d65 +SIZE (Cloudef-bemenu-0.1.0-11-g6cc18e3_GH0.tar.gz) = 118128 diff --git a/x11/bemenu/files/patch-lib_renderers_wayland_wayland.c b/x11/bemenu/files/patch-lib_renderers_wayland_wayland.c deleted file mode 100644 index e2308ddddb4..00000000000 --- a/x11/bemenu/files/patch-lib_renderers_wayland_wayland.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/renderers/wayland/wayland.c.orig 2019-03-07 08:35:43 UTC -+++ lib/renderers/wayland/wayland.c -@@ -266,7 +266,7 @@ constructor(struct bm_menu *menu) - wl_list_insert(&wayland->windows, &window->link); - } - -- if (!efd && (efd = epoll_create(EPOLL_CLOEXEC)) < 0) -+ if (!efd && (efd = epoll_create1(EPOLL_CLOEXEC)) < 0) - goto fail; - - struct epoll_event ep; diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile index 393eab75971..6943a101364 100644 --- a/x11/qimageblitz/Makefile +++ b/x11/qimageblitz/Makefile @@ -11,7 +11,7 @@ COMMENT= Graphical effects and filters library for Qt5 LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake qt:5 +USES= cmake compiler:c++11-lang qt:5 USE_LDCONFIG= yes USE_QT= core gui widgets qmake_build buildtools_build USE_CXXSTD= gnu++98 diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile index 58273674925..e21fafc6ee1 100644 --- a/x11/xcb-util-keysyms/Makefile +++ b/x11/xcb-util-keysyms/Makefile @@ -9,6 +9,8 @@ MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= garga@FreeBSD.org COMMENT= Standard X key constants and conversion to/from keycodes +LICENSE= MIT + LIB_DEPENDS= libxcb-util.so:x11/xcb-util XORG_CAT= lib diff --git a/x11/xcb-util-keysyms/pkg-descr b/x11/xcb-util-keysyms/pkg-descr index a2da5f490ca..261342d0e9c 100644 --- a/x11/xcb-util-keysyms/pkg-descr +++ b/x11/xcb-util-keysyms/pkg-descr @@ -8,4 +8,4 @@ the X protocol but which have traditionally been provided by Xlib. Keysyms module is the Starndard X key constants and conversions to/from keycodes. -WWW: http://xcb.freedesktop.org/ +WWW: https://xcb.freedesktop.org/