From 2aeb03c4984246899ec244779816295eadbb5c3c Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 24 Dec 2020 19:49:09 +0000 Subject: [PATCH] Ravenports generated: 24 Dec 2020 19:49 --- Mk/Misc/fpc_equivalents | 16 +- Mk/Misc/port_dates | 10 +- Mk/Misc/repology.json | 32 +- bucket_76/perl-Text-CSV_XS | 8 +- bucket_79/opensmtpd | 21 +- bucket_8D/mpg123 | 8 +- bucket_A9/qemu | 899 ++++------------------------------ bucket_B7/python-Sphinx | 10 +- bucket_C8/perl-Image-ExifTool | 8 +- bucket_D6/python-graphviz | 15 +- bucket_D7/harfbuzz | 16 +- 11 files changed, 184 insertions(+), 859 deletions(-) diff --git a/Mk/Misc/fpc_equivalents b/Mk/Misc/fpc_equivalents index fbcbc9e97..18e9cf3f2 100644 --- a/Mk/Misc/fpc_equivalents +++ b/Mk/Misc/fpc_equivalents @@ -1298,7 +1298,7 @@ perl-Cache-Memcached-Fast 0.26 generated perl-File-chdir 0.1011 generated perl-MIME-Charset 1.012.2 generated perl-Plack-Middleware-FixMissingBodyInRedirect 0.12 generated -perl-Text-CSV_XS 1.44 generated +perl-Text-CSV_XS 1.45 generated perl-Wx-Perl-ProcessStream 0.32 generated python-netaddr 0.8.0 generated R-downloader 0.4 generated @@ -1324,7 +1324,7 @@ hexd 1.0.0 devel/hexd leafpad 0.8.18.1 editors/leafpad mariadb103 10.3.27 databases/mariadb103-server mime-support 3.64 misc/mime-support -opensmtpd 6.7.1p1 mail/opensmtpd +opensmtpd 6.8.0p1 mail/opensmtpd php74-gd 7.4.13 graphics/php74-gd ruby-kaminari-actionview 1.2.1 generated ruby-semantic_puppet 1.0.2 generated @@ -1534,7 +1534,7 @@ R-later 1.1.0.1 generated R-pROC 1.16.2 generated apq-mysql 3.2.0 databases/apq-mysql cdrdao 1.2.4 sysutils/cdrdao -mpg123 1.26.3 audio/mpg123 +mpg123 1.26.4 audio/mpg123 perl-FFI-CheckLib 0.27 generated perl-Test-SharedFork 0.35 generated php80-bz2 8.0.0 archivers/php80-bz2 @@ -1867,7 +1867,7 @@ perl-OpenGL 0.70 generated perl-XML-Parser-Style-EasyTree 0.09 generated perl-YAML-LibYAML 0.82 generated php74-sysvmsg 7.4.13 devel/php74-sysvmsg -qemu 5.1.0 emulators/qemu +qemu 5.2.0 emulators/qemu ruby-railties 6.1.0 generated texi2html 5.0 textproc/texi2html openpam 20190224 N/A @@ -2018,7 +2018,7 @@ perl-Test-MemoryGrowth 0.04 generated perl-XML-SAX-Base 1.09 generated php80-pdo_sqlite 8.0.0 databases/php80-pdo_sqlite postgis 3.1.0 databases/postgis24 -python-Sphinx 3.4.0 generated +python-Sphinx 3.4.1 generated python-coreapi 2.3.3 generated python-jmespath 0.10.0 generated ruby-deep_merge 1.2.1 generated @@ -2216,7 +2216,7 @@ mypaint-brushes1 1.3.1 graphics/mypaint-brushes openssl 1.0.2u security/openssl-unsafe perl-Algorithm-ConsistentHash-JumpHash 0.05 generated perl-Algorithm-DimReduction 0.00001 generated -perl-Image-ExifTool 12.12 generated +perl-Image-ExifTool 12.13 generated perl-Test-Fatal 0.016 generated python-Django 3.1.4 generated python-click-plugins 1.1.1 generated @@ -2361,13 +2361,13 @@ mbedtls 2.25.0 security/mbedtls perl-Text-VisualWidth 0.02 generated perl-libwww-perl 6.50 generated python-breathe 4.25.1 generated -python-graphviz 0.15 generated +python-graphviz 0.16 generated xbrightness 0.3 x11/xbrightness R-sourcetools 0.1.7 generated filezilla 3.51.0 ftp/filezilla gprbuild 2020 N/A guile22 2.2.7 lang/guile2 -harfbuzz 2.7.2 print/harfbuzz +harfbuzz 2.7.3 print/harfbuzz kyua 0.13 devel/kyua libnumbertext 1.0.6 textproc/libnumbertext lld 11.0.0 N/A diff --git a/Mk/Misc/port_dates b/Mk/Misc/port_dates index 786383ec1..5782e70b3 100644 --- a/Mk/Misc/port_dates +++ b/Mk/Misc/port_dates @@ -472,6 +472,7 @@ boehm_garbage_collector 1496875210 1596748771 booch95 1492834910 1579718827 boost-jam 1493137638 1597503389 boost-libraries 1493137638 1607888827 +box2d 1608763987 1608763987 brotli 1526582023 1602118073 byacc 1490805406 1600103923 bzip2 1490254067 1574833210 @@ -626,7 +627,7 @@ gconf 1523659636 1589775390 gcr 1521125041 1604273170 gdal 1519669895 1605053010 gdb 1498093302 1590791952 -gdbm 1495674210 1588189827 +gdbm 1495674210 1608763987 gdk-pixbuf 1497821202 1607489868 gdl 1588642586 1588642586 geany 1514321530 1605030746 @@ -934,7 +935,6 @@ libofx 1526557680 1603855707 libogg 1505366165 1574833210 libopusenc 1538574072 1579030386 liborcus 1516124038 1607479055 -liborcus15 1601142562 1601142562 libotf 1506973873 1574833210 libotr 1548778695 1588295721 libpagemaker 1516124038 1574833210 @@ -948,7 +948,7 @@ libpthread-stubs 1496445304 1574833210 libqxp 1516379090 1574833210 libraqm 1585947938 1607888827 libraw 1585868783 1602957790 -libreoffice 1519191340 1608748496 +libreoffice 1519191340 1608763987 libressl 1490831720 1608521644 libressl-devel 1492465569 1608084092 librevenge 1516124038 1574833210 @@ -2075,7 +2075,7 @@ python-billiard 1517585344 1607888827 python-black 1586475549 1607888827 python-booleanOperations 1578099803 1607888827 python-borgbackup 1546709443 1607888827 -python-botocore 1506630685 1608698552 +python-botocore 1506630685 1608763987 python-breathe 1586968094 1608257032 python-cached-property 1583883988 1607888827 python-cachetools 1587507764 1607888827 @@ -2610,7 +2610,7 @@ vbindiff 1514136533 1574833210 vde2 1546643890 1585754641 veracrypt 1507060574 1607717816 video4linux 1496875210 1590244784 -vim 1505337740 1608698552 +vim 1505337740 1608763987 vimb 1548778695 1586963776 vo-aacenc 1505489237 1574833210 vorbis-tools 1515099169 1590712150 diff --git a/Mk/Misc/repology.json b/Mk/Misc/repology.json index 1af897ad0..ebfe413f1 100644 --- a/Mk/Misc/repology.json +++ b/Mk/Misc/repology.json @@ -25933,11 +25933,11 @@ ,{ "bucket": "76" ,"namebase": "perl-Text-CSV_XS" - ,"version": "1.44" + ,"version": "1.45" ,"homepage": "https://github.com/Tux/Text-CSV_XS" ,"FPC": "generated" ,"keywords": [ "perl" ] - ,"distfile": [ "mirror://CPAN/ID:H/HM/HMBRAND/Text-CSV_XS-1.44.tgz" ] + ,"distfile": [ "mirror://CPAN/ID:H/HM/HMBRAND/Text-CSV_XS-1.45.tgz" ] ,"contacts": [ { "name": "Perl Automaton", "email": "perl@ironwolf.systems" } ] ,"variants": [ @@ -26455,11 +26455,11 @@ ,{ "bucket": "79" ,"namebase": "opensmtpd" - ,"version": "6.7.1p1" + ,"version": "6.8.0p1" ,"homepage": "https://www.opensmtpd.org/" ,"FPC": "mail/opensmtpd" ,"keywords": [ "mail" ] - ,"distfile": [ "https://github.com/OpenSMTPD/OpenSMTPD/releases/download/6.7.1p1/opensmtpd-6.7.1p1.tar.gz" ] + ,"distfile": [ "https://github.com/OpenSMTPD/OpenSMTPD/releases/download/6.8.0p1/opensmtpd-6.8.0p1.tar.gz" ] ,"cpe": { "product": "opensmtpd", "vendor": "openbsd" } ,"variants": [ @@ -30648,11 +30648,11 @@ ,{ "bucket": "8D" ,"namebase": "mpg123" - ,"version": "1.26.3" + ,"version": "1.26.4" ,"homepage": "https://www.mpg123.org/" ,"FPC": "audio/mpg123" ,"keywords": [ "audio" ] - ,"distfile": [ "http://www.mpg123.de/download/mpg123-1.26.3.tar.bz2" ] + ,"distfile": [ "http://www.mpg123.de/download/mpg123-1.26.4.tar.bz2" ] ,"cpe": { "product": "mpg123", "vendor": "mpg123" } ,"variants": [ @@ -37272,11 +37272,11 @@ ,{ "bucket": "A9" ,"namebase": "qemu" - ,"version": "5.1.0" + ,"version": "5.2.0" ,"homepage": "https://www.qemu.org/" ,"FPC": "emulators/qemu" ,"keywords": [ "emulators" ] - ,"distfile": [ "https://download.qemu.org/qemu-5.1.0.tar.xz" ] + ,"distfile": [ "https://download.qemu.org/qemu-5.2.0.tar.xz" ] ,"cpe": { "product": "qemu", "vendor": "qemu" } ,"variants": [ @@ -40274,11 +40274,11 @@ ,{ "bucket": "B7" ,"namebase": "python-Sphinx" - ,"version": "3.4.0" + ,"version": "3.4.1" ,"homepage": "http://sphinx-doc.org/" ,"FPC": "generated" ,"keywords": [ "python" ] - ,"distfile": [ "mirror://PYPIWHL/b0/3a/91d8be8d7fe00e7e8b8e274c2e83011b5201b776cc04bac7222c97647f68/Sphinx-3.4.0-py3-none-any.whl" ] + ,"distfile": [ "mirror://PYPIWHL/6d/b6/020cd8e0706bed5fce458017b002099ba4a3564e5a35788bc2607842435a/Sphinx-3.4.1-py3-none-any.whl" ] ,"contacts": [ { "name": "Python Automaton", "email": "python@ironwolf.systems" } ] ,"variants": [ @@ -44247,11 +44247,11 @@ ,{ "bucket": "C8" ,"namebase": "perl-Image-ExifTool" - ,"version": "12.12" + ,"version": "12.13" ,"homepage": "https://exiftool.org/" ,"FPC": "generated" ,"keywords": [ "perl" ] - ,"distfile": [ "https://exiftool.org/Image-ExifTool-12.12.tar.gz" ] + ,"distfile": [ "https://exiftool.org/Image-ExifTool-12.13.tar.gz" ] ,"contacts": [ { "name": "Perl Automaton", "email": "perl@ironwolf.systems" } ] ,"variants": [ @@ -47197,11 +47197,11 @@ ,{ "bucket": "D6" ,"namebase": "python-graphviz" - ,"version": "0.15" + ,"version": "0.16" ,"homepage": "https://github.com/xflr6/graphviz" ,"FPC": "generated" ,"keywords": [ "python" ] - ,"distfile": [ "mirror://PYPIWHL/64/72/f4f4205db2a58e7a49e8190c0b49e9669d7ecadf6385b5bcdcf910354a6d/graphviz-0.15-py2.py3-none-any.whl" ] + ,"distfile": [ "mirror://PYPIWHL/86/86/89ba50ba65928001d3161f23bfa03945ed18ea13a1d1d44a772ff1fa4e7a/graphviz-0.16-py2.py3-none-any.whl" ] ,"contacts": [ { "name": "Python Automaton", "email": "python@ironwolf.systems" } ] ,"variants": [ @@ -47309,11 +47309,11 @@ ,{ "bucket": "D7" ,"namebase": "harfbuzz" - ,"version": "2.7.2" + ,"version": "2.7.3" ,"homepage": "http://www.freedesktop.org/wiki/Software/HarfBuzz" ,"FPC": "print/harfbuzz" ,"keywords": [ "print" ] - ,"distfile": [ "mirror://GITHUB/harfbuzz:harfbuzz:2.7.2/harfbuzz-harfbuzz-2.7.2.tar.gz" ] + ,"distfile": [ "mirror://GITHUB/harfbuzz:harfbuzz:2.7.3/harfbuzz-harfbuzz-2.7.3.tar.gz" ] ,"cpe": { "product": "harfbuzz", "vendor": "harfbuzz_project" } ,"variants": [ diff --git a/bucket_76/perl-Text-CSV_XS b/bucket_76/perl-Text-CSV_XS index fcb3eec50..05c29ee51 100644 --- a/bucket_76/perl-Text-CSV_XS +++ b/bucket_76/perl-Text-CSV_XS @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= perl-Text-CSV_XS -VERSION= 1.44 +VERSION= 1.45 KEYWORDS= perl VARIANTS= 530 532 SDESC[530]= Comma-Separated Values handling routines (5.30) @@ -11,7 +11,7 @@ CONTACT= Perl_Automaton[perl@ironwolf.systems] DOWNLOAD_GROUPS= main SITES[main]= CPAN/ID:H/HM/HMBRAND -DISTFILE[1]= Text-CSV_XS-1.44.tgz:main +DISTFILE[1]= Text-CSV_XS-1.45.tgz:main DF_INDEX= 1 SPKGS[530]= single SPKGS[532]= single @@ -21,7 +21,7 @@ OPTIONS_STANDARD= none VOPTS[530]= PERL_530=ON PERL_532=OFF VOPTS[532]= PERL_530=OFF PERL_532=ON -DISTNAME= Text-CSV_XS-1.44 +DISTNAME= Text-CSV_XS-1.45 GENERATED= yes @@ -37,5 +37,5 @@ Comma-Separated Values manipulation routines [FILE:99:distinfo] -c4812ddca8e2654736c44bc2ce60b27a428a1bc4d5364b0ed1fad3609c8f9bc4 212377 Text-CSV_XS-1.44.tgz +128a66c946a0d9d439cbb74212b3dced8dcdb5bd0e1b78d98cfb87059f4a416f 255592 Text-CSV_XS-1.45.tgz diff --git a/bucket_79/opensmtpd b/bucket_79/opensmtpd index d02fa70a7..e7f663ac6 100644 --- a/bucket_79/opensmtpd +++ b/bucket_79/opensmtpd @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= opensmtpd -VERSION= 6.7.1p1 +VERSION= 6.8.0p1 KEYWORDS= mail VARIANTS= standard SDESC[standard]= Free implementation of server-side SMTP protocol @@ -9,9 +9,9 @@ HOMEPAGE= https://www.opensmtpd.org/ CONTACT= nobody DOWNLOAD_GROUPS= main -SITES[main]= https://github.com/OpenSMTPD/OpenSMTPD/releases/download/6.7.1p1/ +SITES[main]= https://github.com/OpenSMTPD/OpenSMTPD/releases/download/6.8.0p1/ https://www.opensmtpd.org/archives/ -DISTFILE[1]= opensmtpd-6.7.1p1.tar.gz:main +DISTFILE[1]= opensmtpd-6.8.0p1.tar.gz:main DF_INDEX= 1 SPKGS[standard]= single @@ -38,6 +38,7 @@ FPC_EQUIVALENT= mail/opensmtpd MUST_CONFIGURE= gnu CONFIGURE_ARGS= --without-table-db + --with-mantype=man --with-libasr={{LOCALBASE}} --with-libevent={{LOCALBASE}} --with-libssl={{OPENSSLBASE}} @@ -50,11 +51,11 @@ post-patch-dragonfly: ${RM} -rf ${WRKSRC}/openbsd-compat/vis.h \ ${WRKSRC}/openbsd-compat/sys ${REINPLACE_CMD} -e 's|TAILQ_FOREACH_SAFE|TAILQ_FOREACH_MUTABLE|' \ - ${WRKSRC}/smtpd/parse.y + ${WRKSRC}/usr.sbin/smtpd/parse.y post-install: ${LN} -sf ../../sbin/smtpctl \ - ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap + ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap [FILE:340:descriptions/desc.single] OpenSMTPD is a FREE implementation of the server-side SMTP protocol as @@ -67,7 +68,7 @@ fairly complete SMTP implementation. [FILE:103:distinfo] -7478e918b41e734a39ad082df55cb2607f0933a506fab2c3dd3554a95cdf08ca 859364 opensmtpd-6.7.1p1.tar.gz +f521fa5e2255158641762b5f84d6795126cd2f024dd48da7d436573e752b0980 975834 opensmtpd-6.8.0p1.tar.gz [FILE:374:manifests/plist.single] @@ -99,9 +100,9 @@ share/man/man8/ [FILE:831:patches/patch-mk_smtpd_Makefile.in] ---- mk/smtpd/Makefile.in.orig 2020-05-21 19:12:38 UTC +--- mk/smtpd/Makefile.in.orig 2020-12-23 13:59:52 UTC +++ mk/smtpd/Makefile.in -@@ -1401,13 +1401,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP +@@ -1495,13 +1495,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP $(MKDIR_P) $(DESTDIR)$(bindir) $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 @@ -119,7 +120,7 @@ share/man/man8/ [FILE:398:patches/patch-openbsd-compat_arc4random.c] ---- openbsd-compat/arc4random.c.orig 2020-05-21 19:06:04 UTC +--- openbsd-compat/arc4random.c.orig 2020-12-23 13:53:28 UTC +++ openbsd-compat/arc4random.c @@ -161,6 +161,7 @@ _rs_random_u32(uint32_t *val) return; @@ -140,7 +141,7 @@ share/man/man8/ [FILE:233:patches/patch-openbsd-compat_includes.h] ---- openbsd-compat/includes.h.orig 2020-05-21 19:06:04 UTC +--- openbsd-compat/includes.h.orig 2020-12-23 13:53:28 UTC +++ openbsd-compat/includes.h @@ -65,6 +65,7 @@ #endif diff --git a/bucket_8D/mpg123 b/bucket_8D/mpg123 index 5bfbb6ddf..ee4436821 100644 --- a/bucket_8D/mpg123 +++ b/bucket_8D/mpg123 @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= mpg123 -VERSION= 1.26.3 +VERSION= 1.26.4 KEYWORDS= audio VARIANTS= standard SDESC[standard]= Console MP3 player and decoder library @@ -10,7 +10,7 @@ CONTACT= nobody DOWNLOAD_GROUPS= main SITES[main]= http://www.mpg123.de/download/ -DISTFILE[1]= mpg123-1.26.3.tar.bz2:main +DISTFILE[1]= mpg123-1.26.4.tar.bz2:main DF_INDEX= 1 SPKGS[standard]= single @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-optimization=0 --with-default-audio={{VAR1}} INSTALL_TARGET= install-strip -SOVERSION= 0.45.2 +SOVERSION= 0.45.3 PLIST_SUB= LIBOUT=0.3.0 LIBSYN=0.1.1 @@ -48,7 +48,7 @@ stdout. The file/URL is assumed to be an MPEG-1/2 audio bit stream. [FILE:100:distinfo] -30c998785a898f2846deefc4d17d6e4683a5a550b7eacf6ea506e30a7a736c6e 1046915 mpg123-1.26.3.tar.bz2 +081991540df7a666b29049ad870f293cfa28863b36488ab4d58ceaa7b5846454 1050563 mpg123-1.26.4.tar.bz2 [FILE:571:manifests/plist.single] diff --git a/bucket_A9/qemu b/bucket_A9/qemu index 52fc9e905..cd7eee3ee 100644 --- a/bucket_A9/qemu +++ b/bucket_A9/qemu @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= qemu -VERSION= 5.1.0 +VERSION= 5.2.0 KEYWORDS= emulators VARIANTS= standard SDESC[standard]= Fast CPU emulator and virtualizer for x86 platform @@ -10,7 +10,7 @@ CONTACT= nobody DOWNLOAD_GROUPS= main SITES[main]= https://download.qemu.org/ -DISTFILE[1]= qemu-5.1.0.tar.xz:main +DISTFILE[1]= qemu-5.2.0.tar.xz:main DF_INDEX= 1 SPKGS[standard]= complete primary @@ -22,6 +22,8 @@ OPTIONS_STANDARD= none BUILD_DEPENDS= texi2html:primary:standard python-Sphinx:single:python_default + Zstandard:static:standard + lzo:static:standard BUILDRUN_DEPENDS= nettle:primary:standard fontconfig:primary:standard freetype:primary:standard @@ -30,12 +32,15 @@ BUILDRUN_DEPENDS= nettle:primary:standard curl:primary:standard vde2:single:standard libepoxy:single:standard + snappy:single:standard + Zstandard:shared:standard + lzo:shared:standard USES= cpe gmake pkgconfig bison perl:build python:build jpeg png mesa gettext-runtime gettext-tools ncurses - makeinfo + makeinfo ninja GNOME_COMPONENTS= gdkpixbuf gtk2 vte -SDL_COMPONENTS= sdl2 +SDL_COMPONENTS= sdl2 image2 XORG_COMPONENTS= x11 xext LICENSE= GPLv2:primary @@ -51,23 +56,23 @@ CONFIGURE_ARGS= --disable-usb-redir --disable-kvm --disable-xen --disable-vde - --enable-pcap --enable-docs - --enable-debug - --enable-debug-info + --enable-nettle + --enable-profiler + --enable-curses --prefix={{PREFIX}} --cc={{CC}} --python={{PYTHON_CMD}} --localstatedir=/var - --extra-cflags="-I{{WRKSRC}} -I{{LOCALBASE}}/include -DPREFIX=\\\"\"{{PREFIX}}\\\"\"" - --extra-ldflags="-L/usr/lib -L{{LOCALBASE}}/lib" +BUILD_WRKSRC= {{WRKSRC}}/build MAKE_ENV= BSD_MAKE="{{MAKE}}" V=1 -INSTALL_REQ_TOOLCHAIN= yes +INSTALL_WRKSRC= {{WRKSRC}}/build PLIST_SUB= JQUERY=3.5.1 +CFLAGS= -I{{NCURSESBASE}}/include/ncursesw VAR_OPSYS[freebsd]= CONFIGURE_ARGS=--enable-netmap CONFIGURE_ARGS=--disable-linux-user CONFIGURE_ARGS=--disable-linux-aio @@ -77,25 +82,6 @@ VAR_OPSYS[dragonfly]= CONFIGURE_ARGS=--disable-netmap CONFIGURE_ARGS=--disable-linux-aio post-patch: - ${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ - -e '/libusb/s/ --atleast-version=1\.0\.[0-9]*//' \ - ${WRKSRC}/configure - ${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile.target - ${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile - ${REINPLACE_CMD} -E \ - -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ - ${WRKSRC}/scripts/texi2pod.pl - # GNS3 (promiscuous multicast) - ${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \ - ${WRKSRC}/hw/net/e1000.c - # broken build for optionrom - ${REINPLACE_CMD} -e '/roms="optionrom"/d' ${WRKSRC}/configure # silence some include warnings ${MKDIR} ${WRKSRC}/bsd-user/dragonfly @@ -103,10 +89,6 @@ pre-install: # for some reason file is considered out-of-date ${TOUCH} ${WRKSRC}/config-host.mak -post-patch-dragonfly: - ${REINPLACE_CMD} -e '/libs_qga=..glib_libs/ s|glib_libs|glib_libs -lintl|' \ - ${WRKSRC}/configure - post-install: ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample \ ${STAGEDIR}${PREFIX}/etc @@ -117,10 +99,6 @@ post-install: # remove empty directories ${RM} -r ${STAGEDIR}/var -post-patch-freebsd: - ${REINPLACE_CMD} -e '/libs_qga=..glib_libs/ s|glib_libs|glib_libs -lintl|' \ - ${WRKSRC}/configure - [FILE:782:descriptions/desc.primary] QEMU is a fast processor emulator using dynamic translation to achieve good emulation speed. QEMU has two operating modes: @@ -141,10 +119,10 @@ Many live cd isos also work. [FILE:96:distinfo] -c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5 62911540 qemu-5.1.0.tar.xz +cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc 106902800 qemu-5.2.0.tar.xz -[FILE:3510:manifests/plist.primary] +[FILE:3538:manifests/plist.primary] @sample etc/qemu-ifdown.sample @sample etc/qemu-ifup.sample %%ONLY-LINUX%%bin/ @@ -201,7 +179,6 @@ bin/ qemu-system-cris qemu-system-hppa qemu-system-i386 - qemu-system-lm32 qemu-system-m68k qemu-system-microblaze qemu-system-microblazeel @@ -223,7 +200,6 @@ bin/ qemu-system-sparc qemu-system-sparc64 qemu-system-tricore - qemu-system-unicore32 qemu-system-x86_64 qemu-system-xtensa qemu-system-xtensaeb @@ -251,6 +227,7 @@ share/man/man7/ share/man/man8/ qemu-ga.8.gz qemu-nbd.8.gz + qemu-pr-helper.8.gz share/qemu/ QEMU,cgthree.bin QEMU,tcx.bin @@ -281,13 +258,14 @@ share/qemu/ linuxboot.bin linuxboot_dma.bin multiboot.bin + npcm7xx_bootrom.bin openbios-ppc openbios-sparc32 openbios-sparc64 - opensbi-riscv32-sifive_u-fw_jump.bin - opensbi-riscv32-virt-fw_jump.bin - opensbi-riscv64-sifive_u-fw_jump.bin - opensbi-riscv64-virt-fw_jump.bin + opensbi-riscv32-generic-fw_dynamic.bin + opensbi-riscv32-generic-fw_dynamic.elf + opensbi-riscv64-generic-fw_dynamic.bin + opensbi-riscv64-generic-fw_dynamic.elf palcode-clipper petalogix-ml605.dtb petalogix-s3adsp1800.dtb @@ -298,6 +276,7 @@ share/qemu/ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom + qboot.rom qemu-nsis.bmp qemu_vga.ndrv s390-ccw.img @@ -361,7 +340,7 @@ share/qemu/keymaps/ tr -[FILE:11393:manifests/plist.docs] +[FILE:8042:manifests/plist.docs] share/doc/qemu/index.html share/doc/qemu/docs/ COLO-FT.txt @@ -373,7 +352,6 @@ share/doc/qemu/docs/ ccid.txt colo-proxy.txt conf.py - cpu-hotplug.rst defs.rst.inc generic-loader.txt hyperv.txt @@ -382,14 +360,13 @@ share/doc/qemu/docs/ index.html.in index.rst memory-hotplug.txt - microvm.rst + meson.build multi-thread-compression.txt multiseat.txt nvdimm.txt pci_expander_bridge.txt pcie.txt pcie_pci_bridge.txt - pr-manager.rst pvrdma.txt qcow2-cache.txt qdev-device-use.txt @@ -400,258 +377,13 @@ share/doc/qemu/docs/ replay.txt spice-port-fqdn.txt throttle.txt + u2f.txt usb-storage.txt usb2.txt - version.texi virtio-balloon-stats.txt - virtio-net-failover.rst - virtio-pmem.rst xbzrle.txt xen-save-devices-state.txt -share/doc/qemu/docs/built/index.html -share/doc/qemu/docs/built/devel/ - .buildinfo - atomics.html - bitops.html - clocks.html - decodetree.html - genindex.html - index.html - kconfig.html - loads-stores.html - memory.html - migration.html - multi-thread-tcg.html - objects.inv - reset.html - s390-dasd-ipl.html - search.html - searchindex.js - secure-coding-practices.html - stable-process.html - tcg-icount.html - tcg-plugins.html - tcg.html - testing.html -share/doc/qemu/docs/built/devel/_static/ - alabaster.css - basic.css - custom.css - doctools.js - documentation_options.js - file.png - jquery-%%JQUERY%%.js - jquery.js - language_data.js - minus.png - plus.png - pygments.css - searchtools.js - underscore-1.3.1.js - underscore.js -share/doc/qemu/docs/built/interop/ - .buildinfo - bitmaps.html - dbus-vmstate.html - dbus.html - genindex.html - index.html - live-block-operations.html - objects.inv - pr-helper.html - qemu-ga.8 - qemu-ga.html - search.html - searchindex.js - vhost-user-gpu.html - vhost-user.html - vhost-vdpa.html -share/doc/qemu/docs/built/interop/_static/ - alabaster.css - basic.css - custom.css - doctools.js - documentation_options.js - file.png - jquery-%%JQUERY%%.js - jquery.js - language_data.js - minus.png - plus.png - pygments.css - searchtools.js - underscore-1.3.1.js - underscore.js -share/doc/qemu/docs/built/specs/ - .buildinfo - acpi_hest_ghes.html - acpi_hw_reduced_hotplug.html - genindex.html - index.html - objects.inv - ppc-spapr-xive.html - ppc-xive.html - search.html - searchindex.js - tpm.html -share/doc/qemu/docs/built/specs/_static/ - alabaster.css - basic.css - custom.css - doctools.js - documentation_options.js - file.png - jquery-%%JQUERY%%.js - jquery.js - language_data.js - minus.png - plus.png - pygments.css - searchtools.js - underscore-1.3.1.js - underscore.js -share/doc/qemu/docs/built/system/ - .buildinfo - build-platforms.html - deprecated.html - gdb.html - genindex.html - images.html - index.html - invocation.html - ivshmem.html - keys.html - license.html - linuxboot.html - managed-startup.html - monitor.html - mux-chardev.html - net.html - objects.inv - qemu-block-drivers.7 - qemu-block-drivers.html - qemu-cpu-models.7 - qemu-cpu-models.html - qemu-manpage.html - qemu.1 - quickstart.html - search.html - searchindex.js - security.html - target-arm.html - target-avr.html - target-i386.html - target-m68k.html - target-mips.html - target-ppc.html - target-rx.html - target-s390x.html - target-sparc.html - target-sparc64.html - target-xtensa.html - targets.html - tls.html - usb.html - vnc-security.html -share/doc/qemu/docs/built/system/_static/ - alabaster.css - basic.css - custom.css - doctools.js - documentation_options.js - file.png - jquery-%%JQUERY%%.js - jquery.js - language_data.js - minus.png - plus.png - pygments.css - searchtools.js - underscore-1.3.1.js - underscore.js -share/doc/qemu/docs/built/system/arm/ - aspeed.html - collie.html - cpu-features.html - digic.html - gumstix.html - integratorcp.html - mps2.html - musca.html - musicpal.html - nseries.html - orangepi.html - palm.html - realview.html - stellaris.html - sx1.html - versatile.html - vexpress.html - virt.html - xscale.html -share/doc/qemu/docs/built/system/s390x/ - 3270.html - css.html - protvirt.html - vfio-ap.html - vfio-ccw.html -share/doc/qemu/docs/built/tools/ - .buildinfo - genindex.html - index.html - objects.inv - qemu-img.1 - qemu-img.html - qemu-nbd.8 - qemu-nbd.html - qemu-trace-stap.1 - qemu-trace-stap.html - search.html - searchindex.js - virtfs-proxy-helper.1 - virtfs-proxy-helper.html - virtiofsd.1 - virtiofsd.html -share/doc/qemu/docs/built/tools/_static/ - alabaster.css - basic.css - custom.css - doctools.js - documentation_options.js - file.png - jquery-%%JQUERY%%.js - jquery.js - language_data.js - minus.png - plus.png - pygments.css - searchtools.js - underscore-1.3.1.js - underscore.js -share/doc/qemu/docs/built/user/ - .buildinfo - genindex.html - index.html - main.html - objects.inv - search.html - searchindex.js -share/doc/qemu/docs/built/user/_static/ - alabaster.css - basic.css - custom.css - doctools.js - documentation_options.js - file.png - jquery-%%JQUERY%%.js - jquery.js - language_data.js - minus.png - plus.png - pygments.css - searchtools.js - underscore-1.3.1.js - underscore.js +share/doc/qemu/docs/_templates/editpage.html share/doc/qemu/docs/config/ ich9-ehci-uhci.cfg mach-virt-graphical.cfg @@ -664,11 +396,12 @@ share/doc/qemu/docs/devel/ bitops.rst blkdebug.txt blkverify.txt - build-system.txt + block-coroutine-wrapper.rst + build-system.rst clocks.rst conf.py decodetree.rst - fuzzing.txt + fuzzing.rst index.rst kconfig.rst loads-stores.rst @@ -678,6 +411,8 @@ share/doc/qemu/docs/devel/ multi-thread-tcg.rst multiple-iothreads.txt qapi-code-gen.txt + qom.rst + qtest.rst rcu.txt replay.txt reset.rst @@ -691,6 +426,7 @@ share/doc/qemu/docs/devel/ tracing.txt virtio-migration.txt writing-qmp-commands.txt +share/doc/qemu/docs/devel/_templates/editpage.html share/doc/qemu/docs/interop/ bitmaps.rst conf.py @@ -705,19 +441,9 @@ share/doc/qemu/docs/interop/ prl-xml.txt qcow2.txt qed_spec.txt - qemu-ga-qapi.texi - qemu-ga-ref.7 - qemu-ga-ref.7.pod - qemu-ga-ref.html - qemu-ga-ref.texi - qemu-ga-ref.txt + qemu-ga-ref.rst qemu-ga.rst - qemu-qmp-qapi.texi - qemu-qmp-ref.7 - qemu-qmp-ref.7.pod - qemu-qmp-ref.html - qemu-qmp-ref.texi - qemu-qmp-ref.txt + qemu-qmp-ref.rst qmp-intro.txt qmp-spec.txt vhost-user-gpu.rst @@ -725,6 +451,7 @@ share/doc/qemu/docs/interop/ vhost-user.rst vhost-vdpa.rst vnc-ledstate-Pseudo-encoding.txt +share/doc/qemu/docs/interop/_templates/editpage.html share/doc/qemu/docs/specs/ acpi_cpu_hotplug.txt acpi_hest_ghes.rst @@ -737,11 +464,13 @@ share/doc/qemu/docs/specs/ fw_cfg.txt index.rst ivshmem-spec.txt + nvme.txt pci-ids.txt pci-serial.txt pci-testdev.txt ppc-spapr-hcalls.txt ppc-spapr-hotplug.txt + ppc-spapr-numa.rst ppc-spapr-uv-hcalls.txt ppc-spapr-xive.rst ppc-xive.rst @@ -752,15 +481,20 @@ share/doc/qemu/docs/specs/ vmcoreinfo.txt vmgenid.txt vmw_pvscsi-spec.txt +share/doc/qemu/docs/specs/_templates/editpage.html share/doc/qemu/docs/sphinx/ + depfile.py hxtool.py kerneldoc.py kernellog.py + qapidoc.py qmp_lexer.py share/doc/qemu/docs/sphinx/__pycache__/ + depfile.cpython-%%PYTHON_SUFFIX%%.pyc hxtool.cpython-38.pyc kerneldoc.cpython-38.pyc kernellog.cpython-38.pyc + qapidoc.cpython-%%PYTHON_SUFFIX%%.pyc qmp_lexer.cpython-%%PYTHON_SUFFIX%%.pyc share/doc/qemu/docs/spin/ aio_notify.promela @@ -771,6 +505,7 @@ share/doc/qemu/docs/spin/ share/doc/qemu/docs/system/ build-platforms.rst conf.py + cpu-hotplug.rst cpu-models-mips.rst.inc cpu-models-x86.rst.inc deprecated.rst @@ -789,6 +524,7 @@ share/doc/qemu/docs/system/ mux-chardev.rst mux-chardev.rst.inc net.rst + pr-manager.rst qemu-block-drivers.rst qemu-block-drivers.rst.inc qemu-cpu-models.rst @@ -810,7 +546,10 @@ share/doc/qemu/docs/system/ targets.rst tls.rst usb.rst + virtio-net-failover.rst + virtio-pmem.rst vnc-security.rst +share/doc/qemu/docs/system/_templates/editpage.html share/doc/qemu/docs/system/arm/ aspeed.rst collie.rst @@ -822,17 +561,25 @@ share/doc/qemu/docs/system/arm/ musca.rst musicpal.rst nseries.rst + nuvoton.rst orangepi.rst palm.rst + raspi.rst realview.rst + sbsa.rst stellaris.rst sx1.rst versatile.rst vexpress.rst virt.rst + xlnx-versal-virt.rst xscale.rst +share/doc/qemu/docs/system/i386/ + microvm.rst + pc.rst share/doc/qemu/docs/system/s390x/ 3270.rst + bootdevices.rst css.rst protvirt.rst vfio-ap.rst @@ -842,13 +589,16 @@ share/doc/qemu/docs/tools/ index.rst qemu-img.rst qemu-nbd.rst + qemu-pr-helper.rst qemu-trace-stap.rst virtfs-proxy-helper.rst virtiofsd.rst +share/doc/qemu/docs/tools/_templates/editpage.html share/doc/qemu/docs/user/ conf.py index.rst main.rst +share/doc/qemu/docs/user/_templates/editpage.html share/doc/qemu/interop/ .buildinfo bitmaps.html @@ -860,10 +610,8 @@ share/doc/qemu/interop/ objects.inv pr-helper.html qemu-ga-ref.html - qemu-ga-ref.txt qemu-ga.html qemu-qmp-ref.html - qemu-qmp-ref.txt search.html searchindex.js vhost-user-gpu.html @@ -892,6 +640,7 @@ share/doc/qemu/specs/ genindex.html index.html objects.inv + ppc-spapr-numa.html ppc-spapr-xive.html ppc-xive.html search.html @@ -916,6 +665,7 @@ share/doc/qemu/specs/_static/ share/doc/qemu/system/ .buildinfo build-platforms.html + cpu-hotplug.html deprecated.html gdb.html genindex.html @@ -931,6 +681,7 @@ share/doc/qemu/system/ mux-chardev.html net.html objects.inv + pr-manager.html qemu-block-drivers.html qemu-cpu-models.html qemu-manpage.html @@ -952,6 +703,8 @@ share/doc/qemu/system/ targets.html tls.html usb.html + virtio-net-failover.html + virtio-pmem.html vnc-security.html share/doc/qemu/system/_static/ alabaster.css @@ -980,17 +733,25 @@ share/doc/qemu/system/arm/ musca.html musicpal.html nseries.html + nuvoton.html orangepi.html palm.html + raspi.html realview.html + sbsa.html stellaris.html sx1.html versatile.html vexpress.html virt.html + xlnx-versal-virt.html xscale.html +share/doc/qemu/system/i386/ + microvm.html + pc.html share/doc/qemu/system/s390x/ 3270.html + bootdevices.html css.html protvirt.html vfio-ap.html @@ -1002,6 +763,7 @@ share/doc/qemu/tools/ objects.inv qemu-img.html qemu-nbd.html + qemu-pr-helper.html qemu-trace-stap.html search.html searchindex.js @@ -1060,143 +822,8 @@ share/locale/tr/LC_MESSAGES/qemu.mo share/locale/zh_CN/LC_MESSAGES/qemu.mo -[FILE:3366:patches/patch-configure] ---- configure.orig 2020-08-11 19:17:15 UTC -+++ configure -@@ -501,6 +501,9 @@ numa="" - tcmalloc="no" - jemalloc="no" - replication="yes" -+pcap="no" -+pcap_create="no" -+bpf="no" - bochs="yes" - cloop="yes" - dmg="yes" -@@ -1191,6 +1194,10 @@ for opt do - ;; - --enable-vnc-png) vnc_png="yes" - ;; -+ --enable-pcap) pcap="yes" -+ ;; -+ --disable-pcap) pcap="no" -+ ;; - --disable-slirp) slirp="no" - ;; - --enable-slirp=git) slirp="git" -@@ -3246,6 +3253,14 @@ if check_include "sys/signal.h" ; then - fi - - ########################################## -+# getifaddrs (for tests/test-io-channel-socket ) -+ -+have_ifaddrs_h=yes -+if ! check_include "ifaddrs.h" ; then -+ have_ifaddrs_h=no -+fi -+ -+########################################## - # VTE probe - - if test "$vte" != "no"; then -@@ -5252,7 +5267,7 @@ fi - - # check for libusb - if test "$libusb" != "no" ; then -- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then -+ if $pkg_config libusb-1.0; then - libusb="yes" - libusb_cflags=$($pkg_config --cflags libusb-1.0) - libusb_libs=$($pkg_config --libs libusb-1.0) -@@ -6514,6 +6529,50 @@ EOF - fi - fi - -+########################################## -+# pcap probe -+ -+if test "$pcap" = "yes" -a "$pcap" != "no"; then -+ cat > $TMPC << EOF -+#include -+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } -+EOF -+ if test "$mingw32" = "no" ; then -+ libpcap=-lpcap -+ else -+ libpcap=-lwpcap -+ fi -+ if compile_prog "" "$libpcap" ; then -+ : -+ else -+ echo -+ echo "Error: Could not find pcap" -+ echo "Make sure to have the pcap libs and headers installed." -+ echo -+ exit 1 -+ fi -+ cat > $TMPC << EOF -+#include -+int main(void) -+{ -+ char errbuf[PCAP_ERRBUF_SIZE]; -+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); -+} -+EOF -+ if compile_prog "" "$libpcap" ; then -+ pcap_create="yes" -+ fi -+ cat > $TMPC << EOF -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include -+#include -+int main(void) { return (BPF_MAJOR_VERSION); } -+EOF -+ if compile_prog ; then -+ bpf="yes" -+ fi -+ libs_softmmu="$libpcap $libs_softmmu" -+fi # test "$pcap" - - ########################################## - # End of CC checks -@@ -6910,6 +6969,7 @@ echo "Audio drivers $audio_drv_list" - echo "Block whitelist (rw) $block_drv_rw_whitelist" - echo "Block whitelist (ro) $block_drv_ro_whitelist" - echo "VirtFS support $virtfs" -+echo "pcap support $pcap" - echo "Multipath support $mpath" - echo "VNC support $vnc" - if test "$vnc" = "yes" ; then -@@ -7153,6 +7213,15 @@ fi - if test "$want_tools" = "yes" ; then - echo "CONFIG_TOOLS=y" >> $config_host_mak - fi -+if test "$pcap" = "yes" ; then -+ echo "CONFIG_PCAP=y" >> $config_host_mak -+ if test "$pcap_create" = "yes" ; then -+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak -+ fi -+ if test "$bpf" = "yes" ; then -+ echo "CONFIG_BPF=y" >> $config_host_mak -+ fi -+fi - if test "$slirp" != "no"; then - echo "CONFIG_SLIRP=y" >> $config_host_mak - echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -7420,6 +7489,9 @@ fi - if test "$have_fsxattr" = "yes" ; then - echo "HAVE_FSXATTR=y" >> $config_host_mak - fi -+if test "$have_ifaddrs_h" = "yes" ; then -+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak -+fi - if test "$have_copy_file_range" = "yes" ; then - echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak - fi - - [FILE:365:patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc] ---- disas/libvixl/vixl/a64/disasm-a64.cc.orig 2020-08-11 19:17:14 UTC +--- disas/libvixl/vixl/a64/disasm-a64.cc.orig 2020-12-08 16:59:44 UTC +++ disas/libvixl/vixl/a64/disasm-a64.cc @@ -2693,7 +2693,7 @@ void Disassembler::AppendPCRelativeOffse if (offset < 0) { @@ -1209,295 +836,33 @@ share/locale/zh_CN/LC_MESSAGES/qemu.mo -[FILE:582:patches/patch-include_net_net.h] ---- include/net/net.h.orig 2020-08-11 19:17:15 UTC -+++ include/net/net.h -@@ -209,8 +209,8 @@ void netdev_add(QemuOpts *opts, Error ** - int net_hub_id_for_client(NetClientState *nc, int *id); - NetClientState *net_hub_port_find(int hub_id); - --#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" --#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" -+#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup" -+#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown" - #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - - - -[FILE:563:patches/patch-net_clients.h] ---- net/clients.h.orig 2020-08-11 19:17:15 UTC -+++ net/clients.h -@@ -61,6 +61,12 @@ int net_init_netmap(const Netdev *netdev - int net_init_vhost_user(const Netdev *netdev, const char *name, - NetClientState *peer, Error **errp); - -+#ifdef CONFIG_PCAP -+int net_init_pcap(const Netdev *netdev, const char *name, -+ NetClientState *peer, Error **errp); -+#endif -+ -+ - int net_init_vhost_vdpa(const Netdev *netdev, const char *name, - NetClientState *peer, Error **errp); - #endif /* QEMU_NET_CLIENTS_H */ - - -[FILE:6930:patches/patch-net_net.c] ---- net/net.c.orig 2020-08-11 19:17:15 UTC -+++ net/net.c -@@ -55,6 +55,11 @@ - #include "net/filter.h" - #include "qapi/string-output-visitor.h" - -+#include -+#if defined(__FreeBSD__) || defined(__DragonFly__) -+#include -+#endif -+ - /* Net bridge is currently not supported for W32. */ - #if !defined(_WIN32) - # define CONFIG_NET_BRIDGE -@@ -942,7 +947,225 @@ static int net_init_nic(const Netdev *ne - return idx; - } - -+#if defined(CONFIG_PCAP) -+#if defined(CONFIG_BPF) -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include -+#endif -+#include -+ -+struct PCAPState { -+ NetClientState nc; -+ pcap_t *handle; -+ int max_eth_frame_size; -+}; -+ -+static ssize_t pcap_receive(NetClientState *nc, const uint8_t *buf, size_t size) -+{ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ return pcap_inject(s->handle, (u_char*)buf, size); -+} -+ -+static void pcap_callback(u_char *user, struct pcap_pkthdr *phdr, u_char *pdata -+ ) -+{ -+ NetClientState *nc = (NetClientState *)user; -+ -+ int len = phdr->len; -+#if defined(__FreeBSD__) || defined(__DragonFly__) -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ int max_eth_frame_size = s->max_eth_frame_size; -+ -+ if (len > max_eth_frame_size) { -+ fprintf(stderr, -+ "pcap_send: packet size > %d (%d), truncating\n", -+ max_eth_frame_size, len); -+ len = max_eth_frame_size; -+ } -+#endif -+ qemu_send_packet(nc, pdata, len); -+} -+ -+static void pcap_send(void *opaque) -+{ -+ struct PCAPState *s = (struct PCAPState *)opaque; -+ -+ for (;;) { -+ if (pcap_dispatch(s->handle, 0, (pcap_handler)&pcap_callback, (u_char *)&s->nc) >= 0) -+ break; -+ } -+} -+ -+static void pcap_cleanup(NetClientState *nc) -+{ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ qemu_purge_queued_packets(nc); -+ pcap_close(s->handle); -+} -+ -+static NetClientInfo net_pcap_info = { -+ .type = NET_CLIENT_DRIVER_PCAP, -+ .size = sizeof(struct PCAPState), -+ .receive = pcap_receive, -+// .receive_raw = pcap_receive_raw, -+// .receive_iov = pcap_receive_iov, -+// .poll = pcap_poll, -+ .cleanup = pcap_cleanup, -+}; -+/* -+ * ... -net pcap,ifname="..." -+ */ -+ -+int net_init_pcap(const Netdev *netdev, -+ const char *name, NetClientState *peer, Error **errp) -+{ -+ const NetdevPcapOptions *pcap_opts; -+ NetClientState *nc; -+ struct PCAPState *s; -+ const char *ifname; -+ char errbuf[PCAP_ERRBUF_SIZE]; -+#if defined(_WIN32) -+ HANDLE h; -+#endif -+ int i; -+ -+ assert(netdev->type == NET_CLIENT_DRIVER_PCAP); -+ pcap_opts = &netdev->u.pcap; -+ if (!pcap_opts->has_ifname) -+ return -1; -+ -+ ifname = pcap_opts->ifname; -+ -+ /* create the object */ -+ nc = qemu_new_net_client(&net_pcap_info, peer, "pcap", ifname); -+ s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ if (ifname == NULL && (ifname = pcap_lookupdev(errbuf)) == NULL) { -+ fprintf(stderr, "qemu: pcap_create: %s\n", errbuf); -+ goto fail; -+ } -+ -+#if defined(__FreeBSD__) || defined(__DragonFly__) -+ /* -+ * We want to avoid passing oversize packets to the guest, which -+ * at least on FreeBSD can happen if the host interface uses tso -+ * (seen with an em(4) in this case) - so find out the host -+ * interface's mtu and assume the guest is configured the same. -+ */ -+ s->max_eth_frame_size = 1514; -+ i = socket(AF_INET, SOCK_DGRAM, 0); -+ if (i >= 0) { -+ struct ifreq ifr; -+ -+ (void) memset(&ifr, 0, sizeof(ifr)); -+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); -+ if (ioctl(i, SIOCGIFMTU, &ifr) != -1) -+ s->max_eth_frame_size = ifr.ifr_mtu + 14; -+ close(i); -+ } -+#endif -+ -+#if defined(CONFIG_PCAP_CREATE) || defined(_WIN32) -+ /* -+ * Create pcap handle for the device, set promiscuous mode and activate. -+ */ -+ s->handle = (void *)pcap_create(ifname, errbuf); -+ if (!s->handle) { -+ fprintf(stderr, "qemu: pcap_create: %s\n", errbuf); -+ goto fail; -+ } -+ if (pcap_set_promisc(s->handle, 1) != 0) { -+ pcap_perror(s->handle, (char *)"qemu: pcap_set_promisc:"); -+ goto fail; -+ } -+ if (pcap_activate(s->handle) != 0) { -+ pcap_perror(s->handle, (char *)"qemu: pcap_activate:"); -+ goto fail; -+ } -+#else -+ /* Attempt to connect device. */ -+ s->handle = (void *)pcap_open_live(ifname, 65535, 1, 0, errbuf); -+ if (!s->handle) { -+ fprintf(stderr, "qemu: pcap_open_live: %s\n", errbuf); -+ goto fail; -+ } -+#endif -+ -+ /* Set non-blocking mode. */ -+ if (pcap_setnonblock(s->handle, 1, errbuf) < 0) { -+ fprintf(stderr, "qemu: pcap_setnonblock: %s\n", errbuf); -+ goto fail; -+ } -+ -+#if defined(_WIN32) -+ /* -+ * Tell the kernel that the packet has to be seen immediately. -+ */ -+ if (pcap_setmintocopy(s->handle, 0) < 0) { -+ fprintf(stderr, "qemu: pcap failed to set immediate mode\n"); -+ goto fail; -+ } -+#else /* !_WIN32 */ -+#if defined(CONFIG_BPF) -+#if defined(BIOCIMMEDIATE) -+ /* -+ * Tell the kernel that the packet has to be seen immediately. -+ */ -+ { -+ unsigned int one = 1; -+ if (ioctl(pcap_fileno(s->handle), BIOCIMMEDIATE, &one) < 0) { -+ fprintf(stderr, "qemu: pcap failed to set immediate mode\n"); -+ goto fail; -+ } -+ } -+#endif /* BIOCIMMEDIATE */ -+#if defined(BIOCFEEDBACK) -+ /* -+ * Tell the kernel that the sent packet has to be fed back. -+ * This is necessary to connect host and guest. -+ */ -+ { -+ unsigned int one = 1; -+ if (ioctl(pcap_fileno(s->handle), BIOCFEEDBACK, &one) < 0) { -+ fprintf(stderr, "qemu: pcap failed to set feedback mode\n"); -+ goto fail; -+ } -+ } -+#endif /* BIOCFEEDBACK */ -+#endif /* CONFIG_BPF */ -+#endif /* _WIN32 */ -+ -+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "pcap redirector"); -+ -+#if defined(_WIN32) -+ if ((h = pcap_getevent(s->handle)) == NULL) { -+ fprintf(stderr, "qemu: pcap_getevent failed\n"); -+ goto fail; -+ } -+ qemu_add_wait_object(h, pcap_send, s); -+#else /* !_WIN32 */ -+ if ((i = pcap_get_selectable_fd(s->handle)) < 0) { -+ fprintf(stderr, "qemu: pcap_get_selectable_fd failed\n"); -+ goto fail; -+ } -+ qemu_set_fd_handler(i, pcap_send, NULL, s); -+#endif /* _WIN32 */ -+ -+ return 0; -+ -+fail: -+ if (s) { -+ if (s->handle) -+ pcap_close(s->handle); -+ } -+ -+ return -1; -+} - -+#endif -+ - static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])( - const Netdev *netdev, - const char *name, -@@ -972,6 +1195,9 @@ static int (* const net_client_init_fun[ - #ifdef CONFIG_L2TPV3 - [NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3, - #endif -+#ifdef CONFIG_PCAP -+ [NET_CLIENT_DRIVER_PCAP] = net_init_pcap, -+#endif - }; - - +[FILE:1232:patches/patch-meson.build] +--- meson.build.orig 2020-12-08 16:59:44 UTC ++++ meson.build +@@ -517,15 +517,16 @@ if have_system and not get_option('curse + has_curses_h = cc.has_header('curses.h', args: curses_compile_args) + endif + if has_curses_h +- curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw']) ++ libtinfo = cc.find_library('tinfow', required: false, static: enable_static) ++ curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw']) + foreach curses_libname : curses_libname_list + libcurses = cc.find_library(curses_libname, + required: false, + static: enable_static) + if libcurses.found() +- if cc.links(curses_test, args: curses_compile_args, dependencies: libcurses) ++ if cc.links(curses_test, args: curses_compile_args, dependencies: [libcurses,libtinfo]) + curses = declare_dependency(compile_args: curses_compile_args, +- dependencies: [libcurses]) ++ dependencies: [libcurses, libtinfo]) + break + else + msg = 'curses library not usable' [FILE:423:patches/patch-net_tap-bsd.c] ---- net/tap-bsd.c.orig 2020-08-11 19:17:15 UTC +--- net/tap-bsd.c.orig 2020-12-08 16:59:44 UTC +++ net/tap-bsd.c @@ -31,9 +31,16 @@ @@ -1518,50 +883,8 @@ share/locale/zh_CN/LC_MESSAGES/qemu.mo #include -[FILE:1028:patches/patch-qapi_net.json] ---- qapi/net.json.orig 2020-08-11 19:17:15 UTC -+++ qapi/net.json -@@ -374,6 +374,19 @@ - '*helper': 'str' } } - - ## -+# @NetdevPcapOptions: -+# -+# Use ifname as a source to capture -+# -+# @ifname: #required to determine which interface to capture -+# -+# Since: 1.2 -+## -+{ 'struct': 'NetdevPcapOptions', -+ 'data': { -+ '*ifname': 'str' } } -+ -+## - # @NetdevHubPortOptions: - # - # Connect two or more net clients through a software hub. -@@ -461,7 +474,7 @@ - ## - { 'enum': 'NetClientDriver', - 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', -- 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa' ] } -+ 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa', 'pcap' ] } - - ## - # @Netdev: -@@ -484,6 +497,7 @@ - 'user': 'NetdevUserOptions', - 'tap': 'NetdevTapOptions', - 'l2tpv3': 'NetdevL2TPv3Options', -+ 'pcap': 'NetdevPcapOptions', - 'socket': 'NetdevSocketOptions', - 'vde': 'NetdevVdeOptions', - 'bridge': 'NetdevBridgeOptions', - - [FILE:314:patches/patch-util_getauxval.c] ---- util/getauxval.c.orig 2020-08-11 19:17:15 UTC +--- util/getauxval.c.orig 2020-12-08 16:59:44 UTC +++ util/getauxval.c @@ -98,7 +98,7 @@ unsigned long qemu_getauxval(unsigned lo return 0; @@ -1748,14 +1071,8 @@ exec true exec true -[FILE:66:files/special.mk] -.if "${ARCH_STANDARD}" == "x86_64" -MAKE_ARGS+= ARCH=x86_64 -.endif - - [FILE:436:dragonfly/patch-disas_libvixl_vixl_utils.h] ---- disas/libvixl/vixl/utils.h.orig 2020-08-11 19:17:14 UTC +--- disas/libvixl/vixl/utils.h.orig 2020-12-08 16:59:44 UTC +++ disas/libvixl/vixl/utils.h @@ -42,6 +42,13 @@ namespace vixl { #define PRINTF_CHECK(format_index, varargs_index) @@ -1774,7 +1091,7 @@ MAKE_ARGS+= ARCH=x86_64 [FILE:323:dragonfly/patch-hw-ppc_newworld.c] ---- hw/ppc/mac_newworld.c.orig 2020-08-11 19:17:15 UTC +--- hw/ppc/mac_newworld.c.orig 2020-12-08 16:59:44 UTC +++ hw/ppc/mac_newworld.c @@ -74,6 +74,11 @@ #include "hw/sysbus.h" @@ -1790,12 +1107,12 @@ MAKE_ARGS+= ARCH=x86_64 #define TBFREQ (100UL * 1000UL * 1000UL) -[FILE:334:dragonfly/patch-hw_ppc_mac__oldworld.c] ---- hw/ppc/mac_oldworld.c.orig 2020-08-11 19:17:15 UTC +[FILE:358:dragonfly/patch-hw_ppc_mac__oldworld.c] +--- hw/ppc/mac_oldworld.c.orig 2020-12-08 16:59:44 UTC +++ hw/ppc/mac_oldworld.c -@@ -60,6 +60,11 @@ - - #define GRACKLE_BASE 0xfec00000 +@@ -62,6 +62,11 @@ + #define PROM_BASE 0xffc00000 + #define PROM_SIZE (4 * MiB) +/* FreeBSD headers define this */ +#ifdef round_page @@ -1808,7 +1125,7 @@ MAKE_ARGS+= ARCH=x86_64 [FILE:906:dragonfly/patch-util_coroutine-ucontext.c] ---- util/coroutine-ucontext.c.orig 2020-08-11 19:17:15 UTC +--- util/coroutine-ucontext.c.orig 2020-12-08 16:59:44 UTC +++ util/coroutine-ucontext.c @@ -221,7 +221,15 @@ Coroutine *qemu_coroutine_new(void) 2, arg.i[0], arg.i[1]); diff --git a/bucket_B7/python-Sphinx b/bucket_B7/python-Sphinx index d71071249..8dd093805 100644 --- a/bucket_B7/python-Sphinx +++ b/bucket_B7/python-Sphinx @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= python-Sphinx -VERSION= 3.4.0 +VERSION= 3.4.1 KEYWORDS= python VARIANTS= py38 py39 SDESC[py38]= Python documentation generator (PY38) @@ -10,8 +10,8 @@ HOMEPAGE= http://sphinx-doc.org/ CONTACT= Python_Automaton[python@ironwolf.systems] DOWNLOAD_GROUPS= main -SITES[main]= PYPIWHL/b0/3a/91d8be8d7fe00e7e8b8e274c2e83011b5201b776cc04bac7222c97647f68 -DISTFILE[1]= Sphinx-3.4.0-py3-none-any.whl:main +SITES[main]= PYPIWHL/6d/b6/020cd8e0706bed5fce458017b002099ba4a3564e5a35788bc2607842435a +DISTFILE[1]= Sphinx-3.4.1-py3-none-any.whl:main DF_INDEX= 1 SPKGS[py38]= single SPKGS[py39]= single @@ -23,7 +23,7 @@ VOPTS[py39]= PY38=OFF PY39=ON BUILD_DEPENDS= tar:primary:standard -DISTNAME= Sphinx-3.4.0.dist-info +DISTNAME= Sphinx-3.4.1.dist-info EXTRACT_HEAD[1]= {{LOCALBASE}}/bin/gtar -xf EXTRACT_TAIL[1]= --no-same-owner --no-same-permissions @@ -171,5 +171,5 @@ checks [FILE:108:distinfo] -77c801947eb86457822e01eadd5c2e2de020db0201f1f9fc98b0927980b6d212 2876783 Sphinx-3.4.0-py3-none-any.whl +aeef652b14629431c82d3fe994ce39ead65b3fe87cf41b9a3714168ff8b83376 2877037 Sphinx-3.4.1-py3-none-any.whl diff --git a/bucket_C8/perl-Image-ExifTool b/bucket_C8/perl-Image-ExifTool index 24f8dfe55..d32feb4dc 100644 --- a/bucket_C8/perl-Image-ExifTool +++ b/bucket_C8/perl-Image-ExifTool @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= perl-Image-ExifTool -VERSION= 12.12 +VERSION= 12.13 KEYWORDS= perl VARIANTS= 530 532 SDESC[530]= Read and write meta information (5.30) @@ -11,7 +11,7 @@ CONTACT= Perl_Automaton[perl@ironwolf.systems] DOWNLOAD_GROUPS= main SITES[main]= https://exiftool.org/ -DISTFILE[1]= Image-ExifTool-12.12.tar.gz:main +DISTFILE[1]= Image-ExifTool-12.13.tar.gz:main DF_INDEX= 1 SPKGS[530]= single SPKGS[532]= single @@ -21,7 +21,7 @@ OPTIONS_STANDARD= none VOPTS[530]= PERL_530=ON PERL_532=OFF VOPTS[532]= PERL_530=OFF PERL_532=ON -DISTNAME= Image-ExifTool-12.12 +DISTNAME= Image-ExifTool-12.13 GENERATED= yes @@ -41,5 +41,5 @@ Read and write meta information [FILE:106:distinfo] -4a6536c69c86a0c87b8eed355938ba3eb903324d2f3aea5e6e87d91172b8ecc8 4856057 Image-ExifTool-12.12.tar.gz +16c26ea078f432d12bbc38aaff24c279a58698c006fb3e27261070573860174f 4858357 Image-ExifTool-12.13.tar.gz diff --git a/bucket_D6/python-graphviz b/bucket_D6/python-graphviz index b9f3fadab..a024ff49f 100644 --- a/bucket_D6/python-graphviz +++ b/bucket_D6/python-graphviz @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= python-graphviz -VERSION= 0.15 +VERSION= 0.16 KEYWORDS= python VARIANTS= py38 py39 SDESC[py38]= Simple Python interface for Graphviz (PY38) @@ -10,8 +10,8 @@ HOMEPAGE= https://github.com/xflr6/graphviz CONTACT= Python_Automaton[python@ironwolf.systems] DOWNLOAD_GROUPS= main -SITES[main]= PYPIWHL/64/72/f4f4205db2a58e7a49e8190c0b49e9669d7ecadf6385b5bcdcf910354a6d -DISTFILE[1]= graphviz-0.15-py2.py3-none-any.whl:main +SITES[main]= PYPIWHL/86/86/89ba50ba65928001d3161f23bfa03945ed18ea13a1d1d44a772ff1fa4e7a +DISTFILE[1]= graphviz-0.16-py2.py3-none-any.whl:main DF_INDEX= 1 SPKGS[py38]= single SPKGS[py39]= single @@ -23,7 +23,7 @@ VOPTS[py39]= PY38=OFF PY39=ON RUN_DEPENDS= graphviz:primary:standard -DISTNAME= graphviz-0.15.dist-info +DISTNAME= graphviz-0.16.dist-info GENERATED= yes @@ -31,7 +31,7 @@ GENERATED= yes [PY39].USES_ON= python:py39,wheel -[FILE:1403:descriptions/desc.single] +[FILE:1414:descriptions/desc.single] Graphviz ======== @@ -53,7 +53,8 @@ it with the Graphviz installation of your system. Use the view option/method to directly inspect the resulting (PDF, PNG, SVG, etc.) file with its default application. Graphs can also be rendered and displayed within `Jupyter notebooks`_ (formerly known as -`IPython notebooks`_, example_) as well as the `Jupyter Qt Console`_. +`IPython notebooks`_, example_, nbviewer_) as well as the `Jupyter Qt +Console`_. Links ----- @@ -82,5 +83,5 @@ This package runs under Python 2.7, and 3.6+, use pip_ to install: [FILE:113:distinfo] -403b55553b235875fa521023a06d9c29b46f3a956f960d4e0a5b956bca9eb9ce 18626 graphviz-0.15-py2.py3-none-any.whl +3cad5517c961090dfc679df6402a57de62d97703e2880a1a46147bb0dc1639eb 19471 graphviz-0.16-py2.py3-none-any.whl diff --git a/bucket_D7/harfbuzz b/bucket_D7/harfbuzz index 0ea8e6b7f..5724fb80c 100644 --- a/bucket_D7/harfbuzz +++ b/bucket_D7/harfbuzz @@ -1,7 +1,7 @@ # Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= harfbuzz -VERSION= 2.7.2 +VERSION= 2.7.3 KEYWORDS= print VARIANTS= standard SDESC[standard]= OpenType text shaping engine @@ -9,7 +9,7 @@ HOMEPAGE= http://www.freedesktop.org/wiki/Software/HarfBuzz CONTACT= nobody DOWNLOAD_GROUPS= main -SITES[main]= GITHUB/harfbuzz:harfbuzz:2.7.2 +SITES[main]= GITHUB/harfbuzz:harfbuzz:2.7.3 DISTFILE[1]= generated:main DF_INDEX= 1 SPKGS[standard]= complete @@ -40,7 +40,7 @@ MESON_ARGS= -Dgraphite=enabled INSTALL_TARGET= install-strip INSTALL_REQ_TOOLCHAIN= yes -SOVERSION= 0.20702.0 +SOVERSION= 0.20703.0 TEST_TARGET= check @@ -53,7 +53,7 @@ These are the harfbuzz libraries needed for ICU support. [FILE:109:distinfo] -8ec112ee108642477478b75fc7906422abed404d7530e47ba0a4875f553f1b59 16605557 harfbuzz-harfbuzz-2.7.2.tar.gz +be01bc2c3f1e8902f31b432131280cdfdf6780b72c2389dd63cfab908f6213f3 16696840 harfbuzz-harfbuzz-2.7.3.tar.gz [FILE:1004:manifests/plist.primary] @@ -126,7 +126,7 @@ lib/ lib/pkgconfig/harfbuzz-icu.pc -[FILE:3207:manifests/plist.docs] +[FILE:3358:manifests/plist.docs] share/doc/harfbuzz/ HarfBuzz.png HarfBuzz.svg @@ -154,6 +154,7 @@ share/doc/harfbuzz/ api-index-1-1-3.html api-index-1-2-3.html api-index-1-3-3.html + api-index-1-4-0.html api-index-1-4-2.html api-index-1-4-3.html api-index-1-5-0.html @@ -172,6 +173,7 @@ share/doc/harfbuzz/ api-index-2-4-0.html api-index-2-5-0.html api-index-2-6-0.html + api-index-2-7-3.html api-index-full.html buffers-language-script-and-direction.html building.html @@ -198,9 +200,11 @@ share/doc/harfbuzz/ harfbuzz-hb-common.html harfbuzz-hb-coretext.html harfbuzz-hb-deprecated.html + harfbuzz-hb-directwrite.html harfbuzz-hb-face.html harfbuzz-hb-font.html harfbuzz-hb-ft.html + harfbuzz-hb-gdi.html harfbuzz-hb-glib.html harfbuzz-hb-gobject.html harfbuzz-hb-graphite2.html @@ -210,6 +214,8 @@ share/doc/harfbuzz/ harfbuzz-hb-ot-font.html harfbuzz-hb-ot-layout.html harfbuzz-hb-ot-math.html + harfbuzz-hb-ot-meta.html + harfbuzz-hb-ot-metrics.html harfbuzz-hb-ot-name.html harfbuzz-hb-ot-shape.html harfbuzz-hb-ot-var.html -- 2.41.0