Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*/*: sync with upstream

Browse source 
Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2018-11-14 19:51:39 +01:00
parent 54d6c74818
commit 778293efa6
132 changed files with 1660 additions and 571 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/elisa/Makefile
View file

@ -8,7 +8,7 @@ MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
MAINTAINER= adridg@FreeBSD.org
COMMENT= Audio player with QML and KDE Plasma integration
LICENSE= LGPLv3+
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake compiler:c++14-lang desktop-file-utils gettext kde:5 \

311
audio/musicpd/Makefile
View file

@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= musicpd
PORTVERSION= 0.20.23
PORTREVISION= 1
PORTVERSION= 0.21.2
CATEGORIES= audio ipv6
MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
DISTNAME= mpd-${PORTVERSION}
MAINTAINER= riggs@FreeBSD.org
@ -16,26 +15,28 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \
libicudata.so:devel/icu
USES= compiler:c++14-lang gmake gnome pkgconfig tar:xz
USES= compiler:c++14-lang gnome meson pkgconfig tar:xz
GNU_CONFIGURE= yes
USE_GNOME= glib20
USE_RC_SUBR= ${PORTNAME}
CONFIGURE_ARGS+=--disable-alsa --disable-systemd-daemon --disable-roar
MESON_ARGS= -Dauto_features=disabled \
-Dbzip2=enabled \
-Dhttpd=true \
-Dicu=enabled \
-Doss=enabled \
-Dpipe=true \
-Dzlib=enabled
CFLAGS+= -I${PREFIX}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/sidplay/builders
#Workaround (transient?) link error with libwrap
CONFIGURE_ARGS+=--disable-libwrap
LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= AUTHORS README.md NEWS
SUB_FILES= pkg-message
OPTIONS_DEFINE= ID3TAG IPV6 ARCHIVE SQLITE3 \
LAME VORBISENC DOCS
OPTIONS_DEFINE= DOCS ID3TAG IPV6 ISO9660 SQLITE3 \
LAME VORBISENC ZZIP
OPTIONS_RADIO= RESAMPLER ZEROCONF
@ -44,112 +45,152 @@ OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER
OPTIONS_RADIO_RESAMPLER= SAMPLERATE SOXR
OPTIONS_MULTI= FILE_FORMAT
OPTIONS_MULTI_FILE_FORMAT= AAC ADPLUG FFMPEG FLAC FLUIDSYNTH \
GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \
OPUS SIDPLAY2 SNDFILE TREMOR TWOLAME \
VORBIS WAV WAVPACK WILDMIDI
OPTIONS_MULTI_FILE_FORMAT= \
ADPLUG AUDIOFILE FAAD FFMPEG FLAC FLUIDSYNTH \
GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \
OPUS SIDPLAY2 SNDFILE TWOLAME \
VORBIS WAVPACK WILDMIDI
OPTIONS_GROUP= ACCESS PLAYBACK
OPTIONS_GROUP_ACCESS= CDPARANOIA CURL MMS SMB YAJL
OPTIONS_GROUP_ACCESS= CDPARANOIA CURL MMS QOBUZ SMB SOUNDCLOUD TIDAL YAJL
OPTIONS_GROUP_PLAYBACK= AO HTTPD JACK OPENAL OSS PIPE PULSEAUDIO \
OPTIONS_GROUP_PLAYBACK= AO JACK OPENAL PULSEAUDIO \
SHOUTCAST SNDIO
ADPLUG_DESC= AdPlug support
FAAD_DESC= AAC/MP4 decoding via libfaad
GME_DESC= GME support (video game music files)
ISO9660_DESC= Direct support for ISO 9660 images
LAME_DESC= Support for MP3 Icecast Streams
PIPE_DESC= Support for writing PCM audio to a pipe
QOBUZ_DESC= Streaming service support: Qobuz
SIDPLAY2_DESC= Sidplay support (C64 mono and stereo files)
TREMOR_DESC= Tremor decoder (not with SHOUTCAST; use VORBIS)
SOUNDCLOUD_DESC=Streaming service support: SoundCloud
TIDAL_DESC= Streaming service support: TIDAL
TWOLAME_DESC= TwoLAME support (mp2)
VORBISENC_DESC= Ogg Vorbis encoder
WILDMIDI_DESC= WildMIDI support (MIDI files)
YAJL_DESC= SoundCloud support via libyajl
YAJL_DESC= JSON support via libyajl
ZZIP_DESC= Support for zzip archives
OPTIONS_DEFAULT=HTTPD ID3TAG MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE \
CURL VORBISENC
OPTIONS_DEFAULT=AUDIOFILE CURL FFMPEG FLAC ID3TAG MAD SNDFILE \
VORBIS VORBISENC
AAC_CONFIGURE_ENABLE=aac
AAC_LIB_DEPENDS=libfaad.so:audio/faad
ADPLUG_CONFIGURE_ENABLE=adplug
ADPLUG_LIB_DEPENDS=libadplug.so:audio/libadplug
AO_CONFIGURE_ENABLE=ao
AO_LIB_DEPENDS=libao.so:audio/libao
CDPARANOIA_CONFIGURE_ENABLE=cdio-paranoia
CDPARANOIA_LIB_DEPENDS=libcdda_paranoia.so:audio/cdparanoia
CURL_CONFIGURE_ENABLE=curl
CURL_LIB_DEPENDS=libcurl.so:ftp/curl
FFMPEG_CONFIGURE_ENABLE=ffmpeg
# Decoder plugins
ADPLUG_MESON_ON= -Dadplug=enabled
ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug
AUDIOFILE_MESON_ON= -Daudiofile=enabled
AUDIOFILE_LIB_DEPENDS= libaudiofile.so:audio/libaudiofile
FAAD_MESON_ON= -Dfaad=enabled
FAAD_LIB_DEPENDS= libfaad.so:audio/faad
FFMPEG_MESON_ON= -Dffmpeg=enabled
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libavformat.so:multimedia/ffmpeg \
libavutil.so:multimedia/ffmpeg
FLAC_CONFIGURE_ENABLE=flac
FLAC_LIB_DEPENDS=libFLAC.so:audio/flac
FLUIDSYNTH_CONFIGURE_ENABLE=fluidsynth
FLUIDSYNTH_LIB_DEPENDS=libfluidsynth.so:audio/fluidsynth
GME_CONFIGURE_ENABLE=gme
GME_LIB_DEPENDS=libgme.so:audio/libgme
HTTPD_CONFIGURE_ENABLE=httpd-output
ID3TAG_CONFIGURE_ENABLE=id3
ID3TAG_LIB_DEPENDS=libid3tag.so:audio/libid3tag
IPV6_CONFIGURE_ENABLE=ipv6
JACK_CONFIGURE_ENABLE=jack
JACK_LIB_DEPENDS=libjack.so:audio/jack
LAME_CONFIGURE_ENABLE=lame-encoder
LAME_LIB_DEPENDS=libmp3lame.so:audio/lame
MAD_CONFIGURE_ENABLE=mad
MAD_LIB_DEPENDS=libmad.so:audio/libmad
MIKMOD_CONFIGURE_ENABLE=mikmod
MIKMOD_LIB_DEPENDS=libmikmod.so:audio/libmikmod
MMS_CONFIGURE_ENABLE=mms
MMS_LIB_DEPENDS=libmms.so:net/libmms
MODPLUG_CONFIGURE_ENABLE=modplug
MODPLUG_LIB_DEPENDS=libmodplug.so:audio/libmodplug
MPG123_CONFIGURE_ENABLE=mpg123
MPG123_LIB_DEPENDS=libmpg123.so:audio/mpg123
MUSEPACK_CONFIGURE_ENABLE=mpc
MUSEPACK_LIB_DEPENDS=libmpcdec.so:audio/musepack
OPENAL_CONFIGURE_ENABLE=openal
OPENAL_USES= openal
OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980
OPUS_CONFIGURE_ENABLE=opus
FLAC_MESON_ON= -Dflac=enabled
FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
FLUIDSYNTH_MESON_ON= -Dfluidsynth=enabled
FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
GME_MESON_ON= -Dgme=enabled
GME_LIB_DEPENDS= libgme.so:audio/libgme
MAD_MESON_ON= -Dmad=enabled
MAD_LIB_DEPENDS= libmad.so:audio/libmad
MIKMOD_MESON_ON= -Dmikmod=enabled
MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod
MODPLUG_MESON_ON= -Dmodplug=enabled
MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug
MPG123_MESON_ON= -Dmpg123=enabled
MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123
MUSEPACK_MESON_ON= -Dmpcdec=enabled
MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack
OPUS_MESON_ON= -Dopus=enabled
OPUS_LIB_DEPENDS= libopus.so:audio/opus \
libogg.so:audio/libogg
OSS_CONFIGURE_ENABLE=oss
PIPE_CONFIGURE_ENABLE=pipe-output
PULSEAUDIO_CONFIGURE_ENABLE=pulse
PULSEAUDIO_LIB_DEPENDS=libpulse.so:audio/pulseaudio
SAMPLERATE_CONFIGURE_ENABLE=lsr
SAMPLERATE_LIB_DEPENDS=libsamplerate.so:audio/libsamplerate
SIDPLAY2_CONFIGURE_ENABLE=sidplay
SIDPLAY2_LIB_DEPENDS=libsidplay2.so:audio/libsidplay2
SMB_CONFIGURE_enable=smbclient
SMB_USES= samba:lib
SNDFILE_CONFIGURE_ENABLE=sndfile
SNDFILE_LIB_DEPENDS=libsndfile.so:audio/libsndfile
SNDIO_CONFIGURE_ENABLE=sndio
SNDIO_LIB_DEPENDS=libsndio.so:audio/sndio
SOXR_CONFIGURE_ENABLE=soxr
SOXR_LIB_DEPENDS=libsoxr.so:audio/libsoxr
SQLITE3_CONFIGURE_ENABLE=sqlite
SQLITE3_LIB_DEPENDS=libsqlite3.so:databases/sqlite3
TREMOR_CONFIGURE_WITH=tremor
TREMOR_LIB_DEPENDS=libvorbisidec.so:audio/libtremor
TWOLAME_CONFIGURE_ENABLE=twolame-encoder
TWOLAME_LIB_DEPENDS=libtwolame.so:audio/twolame
VORBISENC_CONFIGURE_ENABLE=vorbis-encoder
VORBISENC_LIB_DEPENDS=libvorbisenc.so:audio/libvorbis
VORBIS_CONFIGURE_ENABLE=vorbis
VORBIS_LIB_DEPENDS=libvorbis.so:audio/libvorbis
WAV_CONFIGURE_ENABLE=audiofile
WAV_LIB_DEPENDS=libaudiofile.so:audio/libaudiofile
WAVPACK_CONFIGURE_ENABLE=wavpack
WAVPACK_LIB_DEPENDS=libwavpack.so:audio/wavpack
WILDMIDI_CONFIGURE_ENABLE=wildmidi
WILDMIDI_LIB_DEPENDS=libWildMidi.so:audio/wildmidi
YAJL_CONFIGURE_ENABLE=yajl
YAJL_LIB_DEPENDS=libyajl.so:devel/yajl
SIDPLAY2_MESON_ON= -Dsidplay=enabled
SIDPLAY2_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2
SIDPLAY2_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders
SNDFILE_MESON_ON= -Dsndfile=enabled
SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile
VORBIS_MESON_ON= -Dvorbis=enabled
VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis
WAVPACK_MESON_ON= -Dwavpack=enabled
WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
WILDMIDI_MESON_ON= -Dwildmidi=enabled
WILDMIDI_LIB_DEPENDS= libWildMidi.so:audio/wildmidi
# Encoder plugins
VORBISENC_MESON_ON= -Dvorbisenc=enabled
VORBISENC_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis
LAME_MESON_ON= -Dlame=enabled
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
TWOLAME_MESON_ON= -Dtwolame=enabled
TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
# Filter plugins
SAMPLERATE_MESON_ON= -Dlibsamplerate=enabled
SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate
SOXR_MESON_ON= -Dsoxr=enabled
SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
# Output plugins
AO_MESON_ON= -Dao=enabled
AO_LIB_DEPENDS= libao.so:audio/libao
JACK_MESON_ON= -Djack=enabled
JACK_LIB_DEPENDS= libjack.so:audio/jack
OPENAL_MESON_ON= -Dopenal=enabled
OPENAL_USES= openal
OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980
PULSEAUDIO_MESON_ON= -Dpulse=enabled
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
SHOUTCAST_MESON_ON= -Dshout=enabled
SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout
SHOUTCAST_IMPLIES= VORBIS
SNDIO_MESON_ON= -Dsndio=enabled
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
# Input plugins
CDPARANOIA_MESON_ON= -Dcdio_paranoia=enabled
CDPARANOIA_LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia
CURL_MESON_ON= -Dcurl=enabled
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
MMS_MESON_ON= -Dmms=enabled
MMS_LIB_DEPENDS= libmms.so:net/libmms
SMB_MESON_ON= -Dsmbclient=enabled
SMB_USES= samba:lib
# Archive plugins
ZZIP_MESON_ON= -Dzzip=enabled
ZZIP_LIB_DEPENDS= libzzip.so:devel/zziplib
ISO9660_MESON_ON= -Diso9660=enabled
ISO9660_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia
# Database plugins
SQLITE3_MESON_ON= -Dsqlite=enabled
SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
# Tag plugins
ID3TAG_MESON_ON= -Did3tag=enabled
ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag
# Network support
IPV6_MESON_ON= -Dipv6=enabled
# Commercial service support
QOBUZ_MESON_ON= -Dqobuz=enabled
QOBUZ_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
QOBUZ_IMPLIES= CURL YAJL
SOUNDCLOUD_MESON_ON= -Dsoundcloud=enabled
SOUNDCLOUD_IMPLIES= CURL YAJL
TIDAL_MESON_ON= -Dtidal=enabled
TIDAL_IMPLIES= CURL YAJL
# Misc library suppore
AVAHI_MESON_ON= -Dzeroconf=avahi
AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app
MDNSRESPONDER_MESON_ON= -Dzeroconf=bonjour
MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder
YAJL_MESON_ON= -Dyajl=enabled
YAJL_LIB_DEPENDS= libyajl.so:devel/yajl
MPDUSER?= mpd
MPDGROUP?= mpd
@ -157,66 +198,30 @@ MPDGROUP?= mpd
USERS= ${MPDUSER}
GROUPS= ${MPDGROUP}
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.ifdef MPDCONF
IGNORE=Please remove the MPDCONF line from make.conf, then rename ${PREFIX}/etc/${MPDCONF} to musicpd.conf, if it exists
.endif
.if exists(${PREFIX}/etc/mpd.conf)
MSG=does not expect ${PREFIX}/etc/mpd.conf to exist.
.if !exists(${PREFIX}/etc/musicpd.conf)
IGNORE=${MSG} Move it to ${PREFIX}/etc/musicpd.conf.
# Note that since the build system switch to meson, mpd fails to link with
# GNU ld 2.17 in base. Also, meson does not allow to set the linker via
# environment variables yet.
# For gcc-based platforms, gcc and ld from ports are used due to the c++14
# requirement. For clang, we set the linker explicitly in meson.build.
.if ${ARCH} == armv6
#lld may use movt/movw, doesn't work on armv6
BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
MPD_CLANG_LD= ${LOCALBASE}/bin/ld
.else
IGNORE=${MSG} You also have musicpd.conf-- check carefully to see which one you want, and remove mpd.conf.
.endif
.endif
.if ${PORT_OPTIONS:MARCHIVE}
CONFIGURE_ARGS+=--enable-bzip2 \
--enable-zzip \
--enable-iso9660
LIB_DEPENDS+= libzzip.so:devel/zziplib \
libcdio_paranoia.so:sysutils/libcdio-paranoia
.else
CONFIGURE_ARGS+=--disable-bzip2 \
--disable-zzip \
--disable-iso9660
.endif
.if ${PORT_OPTIONS:MAVAHI}
CONFIGURE_ARGS+=--with-zeroconf=avahi
LIB_DEPENDS+= libavahi-client.so:net/avahi-app
.else
CONFIGURE_ARGS+=--with-zeroconf=no
.endif
.if ${PORT_OPTIONS:MMDNSRESPONDER}
CONFIGURE_ARGS+=--with-zeroconf=bonjour
LIB_DEPENDS+= libdns_sd.so:net/mDNSResponder
.else
CONFIGURE_ARGS+=--with-zeroconf=no
.endif
# libshout streaming support will be disabled by configure script when built
# also with tremor since the latter does not support vorbis encoding
.if ${PORT_OPTIONS:MSHOUTCAST}
. if ${PORT_OPTIONS:MTREMOR}
IGNORE= shoutcast and tremor do not coexist; use vorbis instead
. endif
LIB_DEPENDS+= libshout.so:audio/libshout
CONFIGURE_ARGS+=--enable-vorbis-encoder \
--enable-shout
.else
CONFIGURE_ARGS+=--disable-shout
MPD_CLANG_LD= lld
.endif
post-patch:
# Insert selected linker for clang
@${REINPLACE_CMD} -e 's|%%MPD_CLANG_LD%%|${MPD_CLANG_LD}|' \
${WRKSRC}/meson.build
# Replace ~/ with /var/mpd/ and make musicpd run as mpd by default
@${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd/,g' \
-e 's,^#\(user[^"]*"\)nobody,\1${MPDUSER},g' \
${WRKSRC}/doc/mpdconf.example
# Uncomment OSS audio output part from MPDCONF; dragons!
# Uncomment OSS audio output part from mpd.conf; dragons!
start=$$(expr $$(${SED} -n '/^# type *"oss"/=' \
${WRKSRC}/doc/mpdconf.example) - 1); \
finish=$$(for n in $$(${JOT} 10 $$start); do \
@ -232,15 +237,15 @@ post-patch:
${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \
${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \
${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \
${STAGEDIR}/${PREFIX}/man/man1/${PORTNAME}.1
${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \
${STAGEDIR}/${PREFIX}/man/man5/${PORTNAME}.conf.5
${MKDIR} ${STAGEDIR}/${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}/
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
${STAGEDIR}/${PREFIX}/etc/${PORTNAME}.conf.sample
.include <bsd.port.mk>
.include <bsd.port.post.mk>

6
audio/musicpd/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1541060556
SHA256 (mpd-0.20.23.tar.xz) = 503e5f9f237290f568ff7956ab2f9aed563594bf749f19b8fe994fb21434afea
SIZE (mpd-0.20.23.tar.xz) = 806784
TIMESTAMP = 1542045324
SHA256 (mpd-0.21.2.tar.xz) = c6ff74ff521aa2b390bdeac299954da21b9d0a66216abdd500ae590d97ab514a
SIZE (mpd-0.21.2.tar.xz) = 664408

27
audio/musicpd/files/patch-meson.build Normal file
View file

@ -0,0 +1,27 @@
--- meson.build.orig 2018-10-31 18:39:53 UTC
+++ meson.build
@@ -62,10 +62,14 @@ test_cxxflags = test_common_flags + [
'-Wno-noexcept-type',
]
+test_ldflags = [
+]
+
if compiler.get_id() == 'clang'
# Workaround for clang bug
# https://bugs.llvm.org/show_bug.cgi?id=32611
test_cxxflags += '-funwind-tables'
+ test_ldflags += '-fuse-ld=%%MPD_CLANG_LD%%'
endif
test_cflags = test_common_flags + [
@@ -78,9 +82,6 @@ test_cflags = test_common_flags + [
'-pedantic',
]
-test_ldflags = [
-]
-
if get_option('buildtype') != 'debug'
test_cflags += [
'-ffunction-sections',

32
databases/bbdb/Makefile
View file

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= bbdb
DISTVERSION= 3.1.2
PORTREVISION= 1
DISTVERSIONPREFIX= v
DISTVERSION= 3.2
CATEGORIES= databases elisp
MASTER_SITES= SAVANNAH
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
@ -13,32 +12,39 @@ COMMENT= Big Brother Database
LICENSE= GPLv3+
.if ${FLAVOR:U} != devel && ${FLAVOR:U} != devel_nox
# http://pkg.awarnach.mathstat.dal.ca/data/11i386-default/2018-05-30_07h36m11s/logs/errors/bbdb-emacs26-3.1.2_1.log
BROKEN= fails to build
.endif
# do not depend on base texinfo on 10
BUILD_DEPENDS= texi2dvi:print/texinfo
USES= emacs
USES= autoreconf emacs
USE_GITHUB= yes
GH_ACCOUNT= emacsmirror
USE_TEX= latex:build
BBDB_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME}
GNU_CONFIGURE= yes
INFO= bbdb
# Do not install the info file. Upstream has yet to add any real content to it.
#INFO= bbdb
PORTDOCS= bbdb.pdf
NO_ARCH= yes
PLIST_SUB+= BBDB_LISPDIR=${BBDB_LISPDIR}
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= DOCS
# See http://lists.nongnu.org/archive/html/bbdb-user/2018-11/msg00003.html
.if ${FLAVOR:U} != devel_full && ${FLAVOR:U} != devel_nox
post-configure:
${REINPLACE_CMD} -e '/[[:blank:]]*--eval '\''(setq byte-compile-dest-file-function (lambda (_) "$$@"))'\'' \\/d' \
${WRKSRC}/lisp/Makefile
.endif
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc \
${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
${STAGEDIR}${PREFIX}/${INFO_PATH}
# Do not install the info file. Upstream has yet to add any real content to it.
# ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
# ${STAGEDIR}${PREFIX}/${INFO_PATH}
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}

6
databases/bbdb/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1513893339
SHA256 (bbdb-3.1.2.tar.gz) = 05780f030584ddaa717d04700bc70e7d9e929141223c7f130fc0c778d73241bf
SIZE (bbdb-3.1.2.tar.gz) = 378935
TIMESTAMP = 1542049821
SHA256 (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 36482abe5e9c11b9262334ae741b8828b9e76e708e54900559a70974f9f0b5df
SIZE (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 189456

15
databases/bbdb/pkg-descr
View file

@ -1,10 +1,7 @@
BBDB is a rolodex-like database program for GNU Emacs. BBDB stands
for Insidious Big Brother Database, and is not, repeat, _not_ an
obscure reference to the Buck Rogers TV series.
BBDB is the Insidious Big Brother Database for GNU Emacs. It provides an
address book for email and snail mail addresses, phone numbers and the
like. It can be linked with various Emacs mail clients (Message and Mail
mode, Rmail, Gnus, MH-E, Mu4e, VM, and Wanderlust). BBDB is fully
customizable.
Put the expression below into your ~/.emacs
(require 'bbdb)
(bbdb-initialize)
WWW: http://bbdb.sourceforge.net/
WWW: http://savannah.nongnu.org/projects/bbdb/

15
databases/bbdb/pkg-message Normal file
View file

@ -0,0 +1,15 @@
########################################################################
Add these lines to your Emacs initialization.
(require 'bbdb-loaddefs)
(require 'bbdb)
Depending on which mail user agent and other miscellaneous packages you
use, you may also want to add something like these lines.
(bbdb-initialize 'gnus 'message)
(bbdb-mua-auto-update-init 'gnus 'message)
Refer to Emacs' help for these two functions, bbdb-initialize and
bbdb-mua-auto-update-init, for details.
########################################################################

9
databases/bbdb/pkg-plist
View file

@ -2,6 +2,8 @@
%%BBDB_LISPDIR%%/bbdb-anniv.elc
%%BBDB_LISPDIR%%/bbdb-com.el
%%BBDB_LISPDIR%%/bbdb-com.elc
%%BBDB_LISPDIR%%/bbdb-gnus-aux.el
%%BBDB_LISPDIR%%/bbdb-gnus-aux.elc
%%BBDB_LISPDIR%%/bbdb-gnus.el
%%BBDB_LISPDIR%%/bbdb-gnus.elc
%%BBDB_LISPDIR%%/bbdb-ispell.el
@ -13,13 +15,12 @@
%%BBDB_LISPDIR%%/bbdb-mhe.elc
%%BBDB_LISPDIR%%/bbdb-migrate.el
%%BBDB_LISPDIR%%/bbdb-migrate.elc
%%BBDB_LISPDIR%%/bbdb-mu4e.el
%%BBDB_LISPDIR%%/bbdb-mua.el
%%BBDB_LISPDIR%%/bbdb-mua.elc
%%BBDB_LISPDIR%%/bbdb-pgp.el
%%BBDB_LISPDIR%%/bbdb-pgp.elc
%%BBDB_LISPDIR%%/bbdb-pkg.el
%%BBDB_LISPDIR%%/bbdb-print.el
%%BBDB_LISPDIR%%/bbdb-print.elc
%%BBDB_LISPDIR%%/bbdb-rmail.el
%%BBDB_LISPDIR%%/bbdb-rmail.elc
%%BBDB_LISPDIR%%/bbdb-sc.el
@ -28,6 +29,10 @@
%%BBDB_LISPDIR%%/bbdb-site.elc
%%BBDB_LISPDIR%%/bbdb-snarf.el
%%BBDB_LISPDIR%%/bbdb-snarf.elc
%%BBDB_LISPDIR%%/bbdb-tex.el
%%BBDB_LISPDIR%%/bbdb-tex.elc
%%BBDB_LISPDIR%%/bbdb-vm-aux.el
%%BBDB_LISPDIR%%/bbdb-vm.el
%%BBDB_LISPDIR%%/bbdb-wl.el
%%BBDB_LISPDIR%%/bbdb.el
%%BBDB_LISPDIR%%/bbdb.elc

2
databases/mariadb102-client/pkg-plist
View file

@ -46,6 +46,7 @@ lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/dialog.so
lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/sha256_password.so
libdata/pkgconfig/libmariadb.pc
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
%%DATADIR%%/charsets/armscii8.xml
@ -75,6 +76,7 @@ lib/mysql/plugin/sha256_password.so
man/man1/msql2mysql.1.gz
man/man1/mysql.1.gz
man/man1/mysql_config.1.gz
@comment man/man1/mysql_embedded.1.gz
man/man1/mysql_find_rows.1.gz
man/man1/mysql_plugin.1.gz
man/man1/mysql_waitpid.1.gz

17
databases/mariadb102-server/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME?= mariadb
PORTVERSION= 10.2.18
PORTVERSION= 10.2.19
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
@ -140,6 +140,7 @@ ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1
CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
CONNECT_EXTRA_USES= gnome
CONNECT_EXTRA_USE= gnome=libxml2
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
@ -163,9 +164,9 @@ ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \
https://jira.mariadb.org/browse/MDEV-9627
#NOT_FOR_ARCHS= i386
#NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \
# https://jira.mariadb.org/browse/MDEV-9627
post-install:
# Remove programs to avoid conflict with mariadb102-client
@ -214,12 +215,4 @@ post-patch:
${WRKSRC}/cmake/os/DragonFly.cmake
.endif
# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
post-configure-INNOBASE-on:
${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
-e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
.include <bsd.port.post.mk>

6
databases/mariadb102-server/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1538065245
SHA256 (mariadb-10.2.18.tar.gz) = 24cef69a81deb7c778de6b226cfedf84193133c49b22e4a37b6a454ec401fc78
SIZE (mariadb-10.2.18.tar.gz) = 71715758
TIMESTAMP = 1542115149
SHA256 (mariadb-10.2.19.tar.gz) = c0e103cfd73ee96d58402073e9513f0f7b5c0bd216641faecc8d763fb6529727
SIZE (mariadb-10.2.19.tar.gz) = 71856357

6
databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt
View file

@ -1,9 +1,9 @@
--- libmariadb/CMakeLists.txt.orig 2017-05-28 18:41:39 UTC
--- libmariadb/CMakeLists.txt.orig 2018-11-12 16:32:38 UTC
+++ libmariadb/CMakeLists.txt
@@ -360,7 +360,7 @@ ENDIF()
@@ -381,7 +381,7 @@ ENDIF()
INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(libmariadb)
ADD_SUBDIRECTORY(plugins)
-IF(NOT WIN32)
+IF(NOT WIN32 AND NOT WITHOUT_CLIENT)
ADD_SUBDIRECTORY(mariadb_config)

40
databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
View file

@ -1,31 +1,31 @@
--- libmariadb/plugins/auth/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-11-12 16:32:38 UTC
+++ libmariadb/plugins/auth/CMakeLists.txt
@@ -26,6 +26,7 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNA
INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth)
ENDIF()
@@ -18,6 +18,7 @@ REGISTER_PLUGIN(TARGET dialog
SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c
${CC_SOURCE_DIR}/libmariadb/get_password.c)
+IF(NOT WITHOUT_CLIENT)
# SHA256 plugin
IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DYNAMIC")
ADD_DEFINITIONS(-DHAVE_SHA256PW_DYNAMIC=1)
@@ -51,6 +52,7 @@ IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DY
SIGN_TARGET(sha256_password)
INSTALL_PLUGIN(sha256_password ${CC_BINARY_DIR}/plugins/auth)
#GSSAPI client authentication plugin
IF(NOT WIN32)
INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W
SOURCES ${AUTH_DIR}/sha256_pw.c
LIBRARIES ${SHA256_LIBS})
ENDIF()
+ENDIF()
# old_password plugin
IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES "DYNAMIC")
@@ -72,6 +74,7 @@ IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES
SIGN_TARGET(mysql_old_password)
ENDIF()
REGISTER_PLUGIN(TARGET mysql_old_password
@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
SOURCES ${AUTH_DIR}/old_password.c)
+IF(NOT WITHOUT_CLIENT)
# Cleartext
IF(AUTH_CLEARTEXT_PLUGIN_TYPE MATCHES "DYNAMIC")
ADD_DEFINITIONS(-DHAVE_CLEARTEXT_DYNAMIC=1)
@@ -124,3 +127,4 @@ IF(${AUTH_GSSAPI_PLUGIN_TYPE} MATCHES "D
INSTALL_PLUGIN(auth_gssapi_client ${CC_BINARY_DIR}/plugins/auth)
ENDIF()
ENDIF()
REGISTER_PLUGIN(TARGET mysql_clear_password
TYPE MARIADB_CLIENT_PLUGIN_AUTH
CONFIGURATIONS DYNAMIC STATIC OFF
DEFAULT DYNAMIC
SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
-
+ENDIF()

19
databases/mariadb102-server/files/patch-libmariadb_plugins_connection_CMakeLists.txt
View file

@ -1,19 +0,0 @@
--- libmariadb/plugins/connection/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
+++ libmariadb/plugins/connection/CMakeLists.txt
@@ -5,6 +5,7 @@ ENDIF()
SET(CMAKE_SHARED_LIBRARY_PREFIX "")
INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
+IF(NOT WITHOUT_CLIENT)
IF(REPLICATION_PLUGIN_TYPE MATCHES "DYNAMIC")
IF(WIN32)
SET_VERSION_INFO("TARGET:replication"
@@ -36,7 +37,7 @@ IF(AURORA_PLUGIN_TYPE MATCHES "DYNAMIC")
ENDIF()
SET(INSTALL_LIBS ${INSTALL_LIBS} aurora)
ENDIF()
-
+ENDIF()
IF(INSTALL_LIBS)
INSTALL(TARGETS

15
databases/mariadb102-server/files/patch-libmariadb_plugins_trace_CMakeLists.txt
View file

@ -1,15 +0,0 @@
--- libmariadb/plugins/trace/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
+++ libmariadb/plugins/trace/CMakeLists.txt
@@ -4,6 +4,7 @@ IF(WITH_SIGNCODE)
INCLUDE(${CC_SOURCE_DIR}/cmake/sign.cmake)
ENDIF()
+IF(NOT WITHOUT_CLIENT)
# Trace example plugin
IF(TRACE_EXAMPLE_PLUGIN_TYPE MATCHES "DYNAMIC")
IF(WIN32)
@@ -23,3 +24,4 @@ IF(TRACE_EXAMPLE_PLUGIN_TYPE MATCHES "DY
INSTALL_PLUGIN(trace_example ${CC_BINARY_DIR}/plugins/trace)
SIGN_TARGET(trace_example)
ENDIF()
+ENDIF()

2
databases/rocksdb/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rocksdb
PORTVERSION= 5.15.10
PORTVERSION= 5.17.2
DISTVERSIONPREFIX= v
CATEGORIES= databases

6
databases/rocksdb/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537046840
SHA256 (facebook-rocksdb-v5.15.10_GH0.tar.gz) = 26d5d4259fa352ae1604b5b4d275f947cacc006f4f7d2ef0b815056601b807c0
SIZE (facebook-rocksdb-v5.15.10_GH0.tar.gz) = 4751526
TIMESTAMP = 1542125596
SHA256 (facebook-rocksdb-v5.17.2_GH0.tar.gz) = 101f05858650a810c90e4872338222a1a3bf3b24de7b7d74466814e6a95c2d28
SIZE (facebook-rocksdb-v5.17.2_GH0.tar.gz) = 5148191

1
databases/rocksdb/pkg-plist
View file

@ -52,6 +52,7 @@ include/rocksdb/table.h
include/rocksdb/table_properties.h
include/rocksdb/thread_status.h
include/rocksdb/threadpool.h
include/rocksdb/trace_reader_writer.h
include/rocksdb/transaction_log.h
include/rocksdb/types.h
include/rocksdb/universal_compaction.h

2
deskutils/gnome-documents/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-documents
PORTVERSION= 3.28.1
PORTVERSION= 3.28.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

6
deskutils/gnome-documents/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1528490685
SHA256 (gnome3/gnome-documents-3.28.1.tar.xz) = f50226f3c08dc7e2069d3365335fc1ab187b0939f04ab55e97aca7b70c111ac4
SIZE (gnome3/gnome-documents-3.28.1.tar.xz) = 4800112
TIMESTAMP = 1538670100
SHA256 (gnome3/gnome-documents-3.28.2.tar.xz) = 58f2ee1cf0967848e6e1dd37d4b6bcb6bc17b14379922aad344fbe34b0b55629
SIZE (gnome3/gnome-documents-3.28.2.tar.xz) = 4800076

3
deskutils/gnome-photos/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-photos
PORTVERSION= 3.28.0
PORTREVISION= 1
PORTVERSION= 3.28.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

6
deskutils/gnome-photos/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1525978749
SHA256 (gnome3/gnome-photos-3.28.0.tar.xz) = 2160f0c6f43d6869894016ea8b7276d0da3c7f70c6c8049cff94bfcc8e0448d8
SIZE (gnome3/gnome-photos-3.28.0.tar.xz) = 1137776
TIMESTAMP = 1538669149
SHA256 (gnome3/gnome-photos-3.28.1.tar.xz) = ff8684c3d6f64301ea49271a80c01322b3bd8eed8ce8f4779c4880280cfdd1e0
SIZE (gnome3/gnome-photos-3.28.1.tar.xz) = 1139192

4
devel/arachne-pnr/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= arachne-pnr
PORTVERSION= g20180310
PORTVERSION= g20181021
CATEGORIES= devel
MAINTAINER= jsorocil@gmail.com
@ -17,7 +17,7 @@ USES= compiler:c++11-lang gmake
USE_GITHUB= yes
GH_ACCOUNT= cseed
GH_TAGNAME= 6701132cbd5c7b31edd0ff18ca6727eb3691186b
GH_TAGNAME= 840bdfdeb38809f9f6af4d89dd7b22959b176fdd
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/arachne-pnr

6
devel/arachne-pnr/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1527417304
SHA256 (cseed-arachne-pnr-g20180310-6701132cbd5c7b31edd0ff18ca6727eb3691186b_GH0.tar.gz) = 0a4f3a5beefbe56863e6e9b680054b7f88bb7aed9682c8bb04c9147345320b49
SIZE (cseed-arachne-pnr-g20180310-6701132cbd5c7b31edd0ff18ca6727eb3691186b_GH0.tar.gz) = 91249
TIMESTAMP = 1540151995
SHA256 (cseed-arachne-pnr-g20181021-840bdfdeb38809f9f6af4d89dd7b22959b176fdd_GH0.tar.gz) = 33b05788e49c130e23e1daaa519b4c076b0c03fb5284bc29af8738848fad7c39
SIZE (cseed-arachne-pnr-g20181021-840bdfdeb38809f9f6af4d89dd7b22959b176fdd_GH0.tar.gz) = 94415

1
devel/arachne-pnr/pkg-plist
View file

@ -3,3 +3,4 @@ bin/arachne-pnr
%%DATADIR%%/chipdb-384.bin
%%DATADIR%%/chipdb-5k.bin
%%DATADIR%%/chipdb-8k.bin
%%DATADIR%%/chipdb-lm4k.bin

46
devel/gdcm/pkg-plist
View file

@ -1,5 +1,5 @@
bin/gdcm%%GDCM_MAJOR%%pnm
bin/gdcm%%GDCM_MAJOR%%vtk
%%VTK%%bin/gdcm%%GDCM_MAJOR%%pnm
%%VTK%%bin/gdcm%%GDCM_MAJOR%%vtk
bin/gdcmanon
bin/gdcmconv
bin/gdcmdiff
@ -12,7 +12,7 @@ bin/gdcmraw
bin/gdcmscanner
bin/gdcmscu
bin/gdcmtar
bin/gdcmviewer
%%VTK%%bin/gdcmviewer
bin/gdcmxml
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/gdcmAAbortPDU.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/gdcmAAssociateACPDU.h
@ -396,23 +396,23 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/socketxx/smtp.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/socketxx/sockinet.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/socketxx/sockstream.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/socketxx/sockunix.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMImageReader.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMImageReader%%GDCM_MAJOR%%.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMImageWriter.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMMedicalImageProperties.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMPolyDataReader.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMPolyDataWriter.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMTesting.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMThreadedImageReader.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMThreadedImageReader%%GDCM_MAJOR%%.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageColorViewer.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageMapToColors16.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageMapToWindowLevelColors%%GDCM_MAJOR%%.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImagePlanarComponentsToComponents.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageRGBToYBR.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageYBRToRGB.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkLookupTable16.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkRTStructSetProperties.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMImageReader.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMImageReader%%GDCM_MAJOR%%.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMImageWriter.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMMedicalImageProperties.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMPolyDataReader.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMPolyDataWriter.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMTesting.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMThreadedImageReader.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkGDCMThreadedImageReader%%GDCM_MAJOR%%.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageColorViewer.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageMapToColors16.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageMapToWindowLevelColors%%GDCM_MAJOR%%.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImagePlanarComponentsToComponents.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageRGBToYBR.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkImageYBRToRGB.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkLookupTable16.h
%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/vtkRTStructSetProperties.h
include/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/zipstreamimpl.h
lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/GDCMConfig.cmake
lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_PATCH%%/GDCMConfigVersion.cmake
@ -455,9 +455,9 @@ lib/libgdcmuuid.so.%%GDCM_MAJOR%%.%%GDCM_PATCH%%.%%GDCM_PATCH%%
lib/libsocketxx.so
lib/libsocketxx.so.1.%%GDCM_MAJOR%%
lib/libsocketxx.so.1.%%GDCM_MAJOR%%.0
lib/libvtkgdcm.so
lib/libvtkgdcm.so.%%GDCM_MAJOR%%
lib/libvtkgdcm.so.%%GDCM_MAJOR%%.%%GDCM_PATCH%%.%%GDCM_PATCH%%
%%VTK%%lib/libvtkgdcm.so
%%VTK%%lib/libvtkgdcm.so.%%GDCM_MAJOR%%
%%VTK%%lib/libvtkgdcm.so.%%GDCM_MAJOR%%.%%GDCM_PATCH%%.%%GDCM_PATCH%%
%%DATADIR%%/XML/CSAHeader.xml
%%DATADIR%%/XML/Part3.xml
%%DATADIR%%/XML/Part4.xml

17
devel/gnu-efi/Makefile
View file

@ -2,25 +2,24 @@
# $FreeBSD$
PORTNAME= gnu-efi
PORTVERSION= 3.0.3
PORTREVISION= 5
PORTVERSION= 3.0.9
CATEGORIES= devel
MASTER_SITES= SF/gnu-efi
MAINTAINER= ports@FreeBSD.org
MAINTAINER= egypcio@googlemail.com
COMMENT= SDK for EFI applications
LICENSE= GPLv2
ONLY_FOR_ARCHS= amd64
BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils
USES= gmake tar:bz2
USE_GCC= yes
MAKE_JOBS_UNSAFE= yes
CFLAGS+= "-fPIC"
CPPFLAGS+= "-fPIC"
USES= compiler:c++11-lib gmake tar:bz2
CFLAGS+= -fPIC
CPPFLAGS+= -fPIC
MAKE_ARGS+= CC=${CC} HOSTCC=${CC} AR=${AR}
ONLY_FOR_ARCHS= amd64
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/crt0-efi-x86_64.o

5
devel/gnu-efi/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (gnu-efi-3.0.3.tar.bz2) = c530f21a15fd9c214dd92d29a6caa20fac989289267512020b6da1f5e6f5b4cb
SIZE (gnu-efi-3.0.3.tar.bz2) = 142229
TIMESTAMP = 1541586539
SHA256 (gnu-efi-3.0.9.tar.bz2) = 6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0
SIZE (gnu-efi-3.0.9.tar.bz2) = 154445

1
devel/gnu-efi/pkg-plist
View file

@ -2,6 +2,7 @@ include/efi/efi.h
include/efi/efi_nii.h
include/efi/efi_pxe.h
include/efi/efiapi.h
include/efi/eficompiler.h
include/efi/eficon.h
include/efi/efidebug.h
include/efi/efidef.h

4
devel/icestorm/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= icestorm
PORTVERSION= g20180310
PORTVERSION= g20181021
CATEGORIES= devel
MAINTAINER= jsorocil@gmail.com
@ -19,7 +19,7 @@ SHEBANG_FILES= ${WRKSRC}/icebox/*.py \
USE_GITHUB= yes
GH_ACCOUNT= cliffordwolf
GH_TAGNAME= 4476d83f76fa0222be0b691fe27c1e0228266f82
GH_TAGNAME= 5ab07ed32a768d484284f1d0e58f61c2ef9d398a
BINARY_ALIAS= python3=${PYTHON_CMD}

6
devel/icestorm/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1527186186
SHA256 (cliffordwolf-icestorm-g20180310-4476d83f76fa0222be0b691fe27c1e0228266f82_GH0.tar.gz) = 1dc3b821e0e4bcdc7f61655678e04fac847f820a5d15a2f89bcbe0baed477bcb
SIZE (cliffordwolf-icestorm-g20180310-4476d83f76fa0222be0b691fe27c1e0228266f82_GH0.tar.gz) = 865104
TIMESTAMP = 1540150802
SHA256 (cliffordwolf-icestorm-g20181021-5ab07ed32a768d484284f1d0e58f61c2ef9d398a_GH0.tar.gz) = f133d6f39452cd738a92efd42e8cc5ce8a59c8e352bef27509a96177f4b3203a
SIZE (cliffordwolf-icestorm-g20181021-5ab07ed32a768d484284f1d0e58f61c2ef9d398a_GH0.tar.gz) = 873783

9
devel/icestorm/pkg-plist
View file

@ -1,3 +1,4 @@
bin/icebox.py
bin/icebox_asc2hlc
bin/icebox_chipdb
bin/icebox_colbuf
@ -8,7 +9,6 @@ bin/icebox_html
bin/icebox_maps
bin/icebox_stat
bin/icebox_vlog
bin/icebox.py
bin/iceboxdb.py
bin/icebram
bin/icemulti
@ -21,3 +21,10 @@ share/icebox/chipdb-1k.txt
share/icebox/chipdb-384.txt
share/icebox/chipdb-5k.txt
share/icebox/chipdb-8k.txt
share/icebox/chipdb-lm4k.txt
share/icebox/timings_hx1k.txt
share/icebox/timings_hx8k.txt
share/icebox/timings_lp1k.txt
share/icebox/timings_lp384.txt
share/icebox/timings_lp8k.txt
share/icebox/timings_up5k.txt

2
devel/lattice-ice40-tools/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= lattice-ice40-tools
PORTVERSION= g20180310
PORTVERSION= g20181021
CATEGORIES= devel
MAINTAINER= jsorocil@gmail.com

2
devel/llvm-cheri/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/llvm-devel/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/llvm35/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/llvm38/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/llvm40/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/llvm50/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/llvm60/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/llvm70/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(/bin/realpath $0)
tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
devel/p4/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= p4
PORTVERSION= ${YEAR}.${MAJOR}.${MINOR}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
# Perforce stupidly rerolls their distfiles on a regular basis, updating the
# files' timestamps when they do, which changes the zip file's checksum. Work

23
devel/p4/files/patch-net_netsslcredentials.cc Normal file
View file

@ -0,0 +1,23 @@
--- net/netsslcredentials.cc.orig 2018-02-05 20:46:46.000000000 +0000
+++ net/netsslcredentials.cc 2018-11-08 16:32:39.241553000 +0000
@@ -42,6 +42,7 @@ extern "C"
# include <openssl/x509v3.h>
# include <openssl/ssl.h>
# include <openssl/x509_vfy.h>
+# include <openssl/opensslv.h>
}
# include <stdio.h>
# include "netdebug.h"
@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e )
privateKey = PEM_read_PrivateKey(fp, NULL, 0, NULL );
SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM_read_PrivateKey", failSetError );
// verify that RSA key
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (privateKey->type != EVP_PKEY_RSA)
+#else
+ if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA)
+#endif
{
e->Set( MsgRpc::SslKeyNotRSA );
goto fail;

9
devel/py-fabric3/Makefile
View file

@ -2,19 +2,20 @@
# $FreeBSD$
PORTNAME= fabric3
DISTVERSION= 1.12.post1
DISTVERSION= 1.14
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Fabric3-${DISTVERSION}
DISTNAME= Fabric3-${DISTVERSION}.post1
MAINTAINER= ports@FreeBSD.org
MAINTAINER= egypcio@googlemail.com
COMMENT= Python tool for remote execution and deployment
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= python
USE_PYTHON= autoplist distutils
USE_PYTHON= autoplist distutils flavors
NO_ARCH= yes

6
devel/py-fabric3/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1478132139
SHA256 (Fabric3-1.12.post1.tar.gz) = 9b868ba64bd4bd7d6beac9dea0911de65f278628ab93ef7bee7f7ff32a8892ba
SIZE (Fabric3-1.12.post1.tar.gz) = 218077
TIMESTAMP = 1541763372
SHA256 (Fabric3-1.14.post1.tar.gz) = 647e485ec83f30b587862f92374d6affc217f3d79819d1d7f512e42e7ae51e81
SIZE (Fabric3-1.14.post1.tar.gz) = 230856

8
devel/py-petname/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= petname
PORTVERSION= 2.0
PORTVERSION= 2.2
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -10,7 +10,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
COMMENT= Generate human-readable, random object names
LICENSE= APACHE20
USES= python
USE_PYTHON= distutils autoplist
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
.include <bsd.port.mk>

6
devel/py-petname/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1475690728
SHA256 (petname-2.0.tar.gz) = 28a1af453ed004e1a17eea9cd97b9bdd1d9fead6e770a6b1f0bd46541042fed0
SIZE (petname-2.0.tar.gz) = 8097
TIMESTAMP = 1542046028
SHA256 (petname-2.2.tar.gz) = be1da50a6aa01e39840e9a4b79b527a333b256733cb681f52669c08df7819ace
SIZE (petname-2.2.tar.gz) = 8197

2
devel/py-petname/pkg-descr
View file

@ -2,4 +2,4 @@ This utility will generate "pet names", consisting of a random combination of
an adverb, adjective, and proper name. These are useful for unique hostnames,
for instance.
WWW: https://pypi.org/project/petname/
WWW: https://github.com/dustinkirkland/python-petname

2
devel/rubygem-aws-sdk-core/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-core
DISTVERSION= 2.11.168
DISTVERSION= 2.11.169
CATEGORIES= devel rubygems
MASTER_SITES= RG

6
devel/rubygem-aws-sdk-core/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1541936776
SHA256 (rubygem/aws-sdk-core-2.11.168.gem) = 7a6269dda9eecfb4ead1c425cd6eb3b7419553d26d3b4f890cc94a9bfa5ab476
SIZE (rubygem/aws-sdk-core-2.11.168.gem) = 1381376
TIMESTAMP = 1542125702
SHA256 (rubygem/aws-sdk-core-2.11.169.gem) = ad9c1a89672f196f22bfa998a1ffd714c07544b9f7813f7c6450bf69af00051f
SIZE (rubygem/aws-sdk-core-2.11.169.gem) = 1383936

2
devel/rubygem-aws-sdk-resources/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-resources
DISTVERSION= 2.11.168
DISTVERSION= 2.11.169
CATEGORIES= devel rubygems
MASTER_SITES= RG

6
devel/rubygem-aws-sdk-resources/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1541936796
SHA256 (rubygem/aws-sdk-resources-2.11.168.gem) = 066e5f4558a8eae146f26265793e2f2cccbe4becaadd47cb0c8299686e82733f
SIZE (rubygem/aws-sdk-resources-2.11.168.gem) = 48640
TIMESTAMP = 1542125725
SHA256 (rubygem/aws-sdk-resources-2.11.169.gem) = 9e4c0bc1675566d289f663e9ac32378af19d03ccc6e0caeb007192c53cbd012e
SIZE (rubygem/aws-sdk-resources-2.11.169.gem) = 48640

2
devel/rubygem-aws-sdk/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk
DISTVERSION= 2.11.168
DISTVERSION= 2.11.169
CATEGORIES= devel rubygems
MASTER_SITES= RG

6
devel/rubygem-aws-sdk/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1541936817
SHA256 (rubygem/aws-sdk-2.11.168.gem) = 0b5d35c7d0a62b4eb1fe618659b6ec7d9db5b558a780884c7b5586a745c5aa33
SIZE (rubygem/aws-sdk-2.11.168.gem) = 4608
TIMESTAMP = 1542125747
SHA256 (rubygem/aws-sdk-2.11.169.gem) = 4c6e39b6ea4025f344f1d30f90f6e2a6933f39ec66240260d4961537ca8f6d3e
SIZE (rubygem/aws-sdk-2.11.169.gem) = 4608

2
devel/rubygem-mocha/pkg-descr
View file

@ -2,4 +2,4 @@ Mocha is a library for mocking and stubbing using a syntax like that
of JMock, and SchMock. One of its main advantages is that it allows
you to mock and stub methods on real (non-mock) classes and instances.
WWW: http://gofreerange.com/mocha/docs/
WWW: https://gofreerange.com/mocha/docs/

5
devel/yosys/Makefile
View file

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= yosys
DISTVERSION= 0.7-783
DISTVERSIONSUFFIX= -gbab39eac
DISTVERSIONPREFIX= yosys-
DISTVERSION= 0.8
CATEGORIES= devel
MAINTAINER= jsorocil@gmail.com
@ -24,7 +24,6 @@ SHEBANG_FILES= backends/smt2/smtbmc.py \
USE_GITHUB= yes
GH_ACCOUNT= YosysHQ
GH_TAGNAME= bab39eacce5c17c42d50a3a60a67cc8a9ee52d98
BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH}
MAKE_ARGS= ABCEXTERNAL=abc

6
devel/yosys/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1527191683
SHA256 (YosysHQ-yosys-0.7-783-gbab39eac-bab39eacce5c17c42d50a3a60a67cc8a9ee52d98_GH0.tar.gz) = 1c97050a19f653fc957550cb5a505e1ebcb5722eade487bd86e8a5f9681ae09c
SIZE (YosysHQ-yosys-0.7-783-gbab39eac-bab39eacce5c17c42d50a3a60a67cc8a9ee52d98_GH0.tar.gz) = 1089933
TIMESTAMP = 1540309364
SHA256 (YosysHQ-yosys-yosys-0.8_GH0.tar.gz) = 07760fe732003585b26d97f9e02bcddf242ff7fc33dbd415446ac7c70e85c66f
SIZE (YosysHQ-yosys-yosys-0.8_GH0.tar.gz) = 1118433

15
devel/yosys/pkg-plist
View file

@ -11,22 +11,27 @@ bin/yosys-smtbmc
%%DATADIR%%/coolrunner2/tff_extract.v
%%DATADIR%%/coolrunner2/xc2_dff.lib
%%DATADIR%%/dff2ff.v
%%DATADIR%%/ecp5/arith_map.v
%%DATADIR%%/ecp5/cells_map.v
%%DATADIR%%/ecp5/cells_sim.v
%%DATADIR%%/ecp5/dram.txt
%%DATADIR%%/ecp5/drams_map.v
%%DATADIR%%/gowin/cells_map.v
%%DATADIR%%/gowin/cells_sim.v
%%DATADIR%%/greenpak4/cells_blackbox.v
%%DATADIR%%/greenpak4/cells_latch.v
%%DATADIR%%/greenpak4/cells_map.v
%%DATADIR%%/greenpak4/cells_sim.v
%%DATADIR%%/greenpak4/cells_sim_ams.v
%%DATADIR%%/greenpak4/cells_sim_digital.v
%%DATADIR%%/greenpak4/cells_sim_wip.v
%%DATADIR%%/greenpak4/cells_sim.v
%%DATADIR%%/greenpak4/gp_dff.lib
%%DATADIR%%/ice40/arith_map.v
%%DATADIR%%/ice40/brams.txt
%%DATADIR%%/ice40/brams_init1.vh
%%DATADIR%%/ice40/brams_init2.vh
%%DATADIR%%/ice40/brams_init3.vh
%%DATADIR%%/ice40/brams_map.v
%%DATADIR%%/ice40/brams.txt
%%DATADIR%%/ice40/cells_map.v
%%DATADIR%%/ice40/cells_sim.v
%%DATADIR%%/ice40/latches_map.v
@ -52,8 +57,8 @@ bin/yosys-smtbmc
%%DATADIR%%/intel/a10gx/cells_map.v
%%DATADIR%%/intel/a10gx/cells_sim.v
%%DATADIR%%/intel/common/altpll_bb.v
%%DATADIR%%/intel/common/brams_map.v
%%DATADIR%%/intel/common/brams.txt
%%DATADIR%%/intel/common/brams_map.v
%%DATADIR%%/intel/common/m9k_bb.v
%%DATADIR%%/intel/cyclone10/cells_map.v
%%DATADIR%%/intel/cyclone10/cells_sim.v
@ -71,16 +76,16 @@ bin/yosys-smtbmc
%%DATADIR%%/simlib.v
%%DATADIR%%/techmap.v
%%DATADIR%%/xilinx/arith_map.v
%%DATADIR%%/xilinx/brams.txt
%%DATADIR%%/xilinx/brams_bb.v
%%DATADIR%%/xilinx/brams_init_%%PYTHON_SUFFIX%%.vh
%%DATADIR%%/xilinx/brams_init_16.vh
%%DATADIR%%/xilinx/brams_init_18.vh
%%DATADIR%%/xilinx/brams_init_32.vh
%%DATADIR%%/xilinx/brams_map.v
%%DATADIR%%/xilinx/brams.txt
%%DATADIR%%/xilinx/cells_map.v
%%DATADIR%%/xilinx/cells_sim.v
%%DATADIR%%/xilinx/cells_xtra.v
%%DATADIR%%/xilinx/drams_map.v
%%DATADIR%%/xilinx/drams.txt
%%DATADIR%%/xilinx/drams_map.v
%%DATADIR%%/xilinx/lut2lut.v

9
dns/bind911/Makefile
View file

@ -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
@ -37,6 +37,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--with-libxml2=${LOCALBASE} \
--with-readline="-L${LOCALBASE}/lib -ledit" \
--with-dlopen=yes \
--with-gost=no \
--sysconfdir=${ETCDIR}
ETCDIR= ${PREFIX}/etc/namedb
@ -193,6 +194,12 @@ TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default
.include <bsd.port.pre.mk>
.if ${SSL_DEFAULT} == base
SUB_LIST+= ENGINES=/usr/lib/engines
.else
SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines
.endif
post-patch:
.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
rndc/rndc.8

12
dns/bind911/files/named.in
View file

@ -62,7 +62,7 @@ required_dirs="${named_chrootdir}"
_named_confdirroot="${named_conf%/*}"
_named_confdir="${named_chrootdir}${_named_confdirroot}"
_named_program_root="${named_program%/sbin/named}"
_openssl_engines="%%LOCALBASE%%/lib/engines"
_openssl_engines="%%ENGINES%%"
# Needed if named.conf and rndc.conf are moved or if rndc.conf is used
rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"}
@ -143,12 +143,12 @@ chroot_autoupdate()
fi
fi
# If OpenSSL from ports, then the engines should be present in the
# chroot, named loads them after chrooting.
# The OpenSSL engines should be present in the chroot, named loads them
# after chrooting.
if [ -d ${_openssl_engines} ]; then
# FIXME when 8.4 is gone see if
# security.jail.param.allow.mount.nullfs can be used.
if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then
if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] ||
[ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] ||
[ `${SYSCTL_N} security.jail.mount_nullfs_allowed` -eq 1 ] ; then
mkdir -p ${named_chrootdir}${_openssl_engines}
mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines}
else

19
emulators/hatari/Makefile
View file

@ -2,33 +2,36 @@
# $FreeBSD$
PORTNAME= hatari
PORTVERSION= 2.0.0
PORTREVISION= 4
PORTVERSION= 2.1.0
CATEGORIES= emulators
MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= egypcio@googlemail.com
COMMENT= Atari ST emulator
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/gpl.txt
BROKEN_aarch64= fails to configure: error: unrecognized CPU type
BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed
BROKEN_powerpc64= fails to compile: sysdeps.h: redefinition of typedef 'uae_u8'
LIB_DEPENDS= libportaudio.so:audio/portaudio \
libpng.so:graphics/png
USES= cmake desktop-file-utils python:2.7 readline shared-mime-info \
shebangfix tar:bzip2
USE_GNOME= pygtk2
USE_XORG= sm ice x11 xext
SHEBANG_FILES= python-ui/*.py tools/atari-convert-dir.py \
tools/debugger/hatari_profile.py tools/hconsole/*.py
USE_GNOME= pygtk2
CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc" \
-DMANDIR:PATH="man/man1" \
-DREADLINE_FOUND:BOOL=ON
INSTALLS_ICONS= yes
BROKEN_aarch64= fails to configure: error: unrecognized CPU type
BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed
BROKEN_powerpc64= fails to compile: sysdeps.h: redefinition of typedef 'uae_u8'
INSTALLS_ICONS= yes
OPTIONS_DEFINE= DEBUG DOCS SDL2 WINUAE

6
emulators/hatari/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1483078197
SHA256 (hatari-2.0.0.tar.bz2) = 52a447a59b6979d55d1525f3c4a21ec013e4371354d6683ede71546c5e6da577
SIZE (hatari-2.0.0.tar.bz2) = 3899087
TIMESTAMP = 1541764401
SHA256 (hatari-2.1.0.tar.bz2) = eb299460e92db4a8a2983a0725cbbc8c185f1470b8ecd791b3d102815da20924
SIZE (hatari-2.1.0.tar.bz2) = 4072778

8
emulators/hatari/files/patch-CMakeLists.txt
View file

@ -1,9 +1,5 @@
${SDL_INCLUDE_DIR} can contain more than one directory,
so using it here as if it is a single directory can confuse
check_include_files. Instead, iterate over it.
--- CMakeLists.txt.orig 2018-03-20 22:30:14.014771000 +0000
+++ CMakeLists.txt 2018-03-20 22:31:23.332802000 +0000
--- CMakeLists.txt.orig 2018-03-20 22:30:14 UTC
+++ CMakeLists.txt
@@ -187,7 +187,12 @@
check_include_files(termios.h HAVE_TERMIOS_H)
check_include_files(strings.h HAVE_STRINGS_H)

20
emulators/hatari/files/patch-share_CMakeLists.txt
View file

@ -1,23 +1,25 @@
--- share/CMakeLists.txt.orig 2015-09-10 21:16:03 UTC
--- share/CMakeLists.txt.orig 2018-02-07 18:33:55 UTC
+++ share/CMakeLists.txt
@@ -5,8 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 2
@@ -5,9 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 2
install(FILES icons/hicolor/${size}/mimetypes/application-x-st-disk-image.png
DESTINATION ${ICONDIR}/${size}/mimetypes)
foreach(type vnd.msa vnd.fastcopy x-stx)
- install(CODE "execute_process(COMMAND ln -sf application-x-st-disk-image.png
- ${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png)
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-x-st-disk-image.png application-${type}-disk-image.png
- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
- application-x-st-disk-image.png
- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png)
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.png application-${type}-disk-image.png
+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes)
")
endforeach()
endforeach()
@@ -16,8 +16,8 @@ install(FILES icons/hicolor/scalable/app
@@ -17,9 +16,8 @@ install(FILES icons/hicolor/scalable/app
install(FILES icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
DESTINATION ${ICONDIR}/scalable/mimetypes)
foreach(type vnd.msa vnd.fastcopy x-stx)
- install(CODE "execute_process(COMMAND ln -sf application-x-st-disk-image.svg
- ${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg)
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-x-st-disk-image.svg application-${type}-disk-image.svg
- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
- application-x-st-disk-image.svg
- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg)
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.svg application-${type}-disk-image.svg
+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes)
")
endforeach()

2
emulators/qemu-utils/Makefile
View file

@ -6,7 +6,7 @@ MAINTAINER= asomers@FreeBSD.org
COMMENT= QEMU userland utilities
HAS_CONFIGURE= yes
USES= cpe gmake pkgconfig perl5 python:2.7,build tar:bzip2
USES= cpe gmake pkgconfig perl5 python:2.7,build tar:xz
USES+= gettext-runtime
USE_GNOME+= glib20
MAKE_ENV+= BSD_MAKE="${MAKE}" PREFIX=${PREFIX}

4
emulators/wine-devel/distinfo
View file

@ -1,3 +1,5 @@
TIMESTAMP = 1541836972
TIMESTAMP = 1542033333
SHA256 (wine-3.20.tar.xz) = 33d61122085056e091042df7d2cbe908ffb9c06e602278611dca2eea6a566f18
SIZE (wine-3.20.tar.xz) = 21541928
SHA256 (v3.20.tar.gz) = 796e6dec0091aa8c22fb1adf3f4bd2b6122b5aac9ae90daffd2e4a4326d0115b
SIZE (v3.20.tar.gz) = 9950555

1
graphics/librsvg2/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= librsvg
PORTVERSION= 2.40.20
PORTREVISON= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 2

2
irc/polari/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= polari
PORTVERSION= 3.28.0
PORTVERSION= 3.28.1
CATEGORIES= irc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome

6
irc/polari/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1526108898
SHA256 (gnome/polari-3.28.0.tar.xz) = a5b53101b9670c7c70a60e30620b3c9234b9f99981a907b615e5d06e336eef23
SIZE (gnome/polari-3.28.0.tar.xz) = 1158792
TIMESTAMP = 1538669593
SHA256 (gnome/polari-3.28.1.tar.xz) = cc271aa1e8ba858caa6d29e2e46dd9f837b4dfd9ec8d9737ececcebc6890c680
SIZE (gnome/polari-3.28.1.tar.xz) = 1171688

4
irc/polari/pkg-plist
View file

@ -128,8 +128,10 @@ share/icons/hicolor/32x32/apps/org.gnome.Polari.png
share/icons/hicolor/48x48/apps/org.gnome.Polari.png
share/icons/hicolor/512x512/apps/org.gnome.Polari.png
share/icons/hicolor/symbolic/apps/org.gnome.Polari-symbolic.svg
share/locale/af/LC_MESSAGES/polari.mo
share/locale/ar/LC_MESSAGES/polari.mo
share/locale/as/LC_MESSAGES/polari.mo
share/locale/be/LC_MESSAGES/polari.mo
share/locale/bs/LC_MESSAGES/polari.mo
share/locale/ca/LC_MESSAGES/polari.mo
share/locale/ca@valencia/LC_MESSAGES/polari.mo
@ -140,6 +142,7 @@ share/locale/el/LC_MESSAGES/polari.mo
share/locale/en_GB/LC_MESSAGES/polari.mo
share/locale/eo/LC_MESSAGES/polari.mo
share/locale/es/LC_MESSAGES/polari.mo
share/locale/et/LC_MESSAGES/polari.mo
share/locale/eu/LC_MESSAGES/polari.mo
share/locale/fa/LC_MESSAGES/polari.mo
share/locale/fi/LC_MESSAGES/polari.mo
@ -147,6 +150,7 @@ share/locale/fr/LC_MESSAGES/polari.mo
share/locale/fur/LC_MESSAGES/polari.mo
share/locale/gl/LC_MESSAGES/polari.mo
share/locale/he/LC_MESSAGES/polari.mo
share/locale/hr/LC_MESSAGES/polari.mo
share/locale/hu/LC_MESSAGES/polari.mo
share/locale/id/LC_MESSAGES/polari.mo
share/locale/it/LC_MESSAGES/polari.mo

2
lang/clang35/files/llvm-wrapper.sh.in
View file

@ -8,4 +8,4 @@ tool=$(basename $0)
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${LLVM_PREFIX}/lib/python" \
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
exec "${tool}" "${@}"

2
lang/gjs/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gjs
PORTVERSION= 1.52.3
PORTVERSION= 1.52.4
CATEGORIES= lang gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

6
lang/gjs/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1525963807
SHA256 (gnome3/gjs-1.52.3.tar.xz) = ce21d8a83f6077b011b8834c4936281be65b2b62387f0745c3eb9adf780996fc
SIZE (gnome3/gjs-1.52.3.tar.xz) = 626512
TIMESTAMP = 1539116944
SHA256 (gnome3/gjs-1.52.4.tar.xz) = 9c160cf9383ca20fcba3b75154c9d19efae9decf63bec6164a81403092d3b4f7
SIZE (gnome3/gjs-1.52.4.tar.xz) = 626960

5
lang/sbcl/Makefile
View file

@ -18,10 +18,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= krion@FreeBSD.org
COMMENT= Common Lisp development system derived from the CMU CL system
LICENSE= ${PORTNAME}
LICENSE_NAME= public domain | FreeBSD
LICENSE= PD BSD2CLAUSE
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE_PERMS= dist-mirror pkg-mirror auto-accept dist-sell pkg-sell
ONLY_FOR_ARCHS= amd64 i386

18
lang/spidermonkey52/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= spidermonkey
PORTVERSION= 52.8.0
PORTREVISION= 2
PORTVERSION= 52.9.0
CATEGORIES= lang
MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source
PKGNAMESUFFIX= ${SP_VER}
@ -26,6 +25,9 @@ SP_VER= 52
WRKSRC= ${WRKDIR}/firefox-${PORTVERSION}esr/js/src
PATCH_WRKSRC= ${WRKDIR}/firefox-${PORTVERSION}esr/
INCLUDE= .cargo Makefile.in build* config* gradle* js memory nsprpub/config
INCLUDE+= mfbt modules moz* python taskcluster testing
EXTRACT_AFTER_ARGS+= ${INCLUDE:S|^|firefox-${PORTVERSION}esr/|}
CONFIGURE_ARGS= --with-pthreads \
--prefix=${PREFIX:Q} \
@ -71,15 +73,21 @@ CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
post-patch:
# Skip some tests because bundled icu differs from system
@${RM} ${WRKSRC}/tests/test262/intl402/ch10/10.2/10.2.3_b.js \
@${RM} ${WRKSRC}/tests/Intl/Date/toLocaleDateString_timeZone.js \
${WRKSRC}/tests/Intl/DateTimeFormat/format.js \
${WRKSRC}/tests/ecma_6/String/normalize-generateddata-part1-not-listed.js
${WRKSRC}/tests/Intl/DateTimeFormat/format_timeZone.js \
${WRKSRC}/tests/Intl/NumberFormat/StringBuffer.js
pre-configure:
cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13
# The directory needs to exist, or configure freaks out:
@${MKDIR} ${WRKSRC:H:H}/intl/icu/source/common/unicode
${LN} -s ${LOCALBASE}/include/unicode/uvernum.h \
${WRKSRC:H:H}/intl/icu/source/common/unicode/
regression-test: build
@${ECHO_MSG} -n "===> Running jstests.py: "
@cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \
@cd ${WRKSRC} && ${SETENV} LANG=C TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \
-d -s --no-progress ./js/src/shell/js
post-install:

6
lang/spidermonkey52/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1525963979
SHA256 (firefox-52.8.0esr.source.tar.xz) = babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287
SIZE (firefox-52.8.0esr.source.tar.xz) = 214054520
TIMESTAMP = 1531516294
SHA256 (firefox-52.9.0esr.source.tar.xz) = c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6
SIZE (firefox-52.9.0esr.source.tar.xz) = 214087304

2
lang/vala/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= vala
PORTVERSION= 0.40.7
PORTVERSION= 0.40.11
PORTEPOCH= 1
CATEGORIES= lang gnome
MASTER_SITES= GNOME

6
lang/vala/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1529611521
SHA256 (vala-0.40.7.tar.xz) = bee662f60ab3a0d5266c1dd66f508cd9ed3254d74622d23c2d6bd94c91990aec
SIZE (vala-0.40.7.tar.xz) = 3359644
TIMESTAMP = 1542058634
SHA256 (vala-0.40.11.tar.xz) = 1fc591258b63cbb0721c784d8a0abedbb178f4205132a7ee3141f32667301576
SIZE (vala-0.40.11.tar.xz) = 3384508

3
lang/vala/pkg-plist
View file

@ -96,6 +96,7 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/fuse.deps
%%DATADIR%%-%%VERSION%%/vapi/fuse.vapi
%%DATADIR%%-%%VERSION%%/vapi/gconf-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gdesktopenums-3.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gdk-3.0.deps
@ -129,6 +130,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/gnet-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gnome-desktop-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gnome-desktop-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gnome-desktop-3.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gnome-desktop-3.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gnome-vfs-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gnutls.vapi
%%DATADIR%%-%%VERSION%%/vapi/gobject-2.0.vapi

2
mail/enma/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= enma
PORTVERSION= 1.2.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/ENMA/${PORTVERSION}

153
mail/enma/files/patch-libsauth_src_dkimdigester.c Normal file
View file

@ -0,0 +1,153 @@
--- ./libsauth/src/dkimdigester.c.org 2011-10-16 17:08:36.000000000 +0900
+++ ./libsauth/src/dkimdigester.c 2018-11-11 18:20:49.869300000 +0900
@@ -32,12 +32,17 @@
#include "dkimpolicybase.h"
#include "dkimdigester.h"
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#define EVP_MD_CTX_new EVP_MD_CTX_create
+#define EVP_MD_CTX_free EVP_MD_CTX_destroy
+#endif
+
struct DkimDigester {
const DkimPolicyBase *policy;
const EVP_MD *digest_alg;
int pubkey_alg;
- EVP_MD_CTX header_digest;
- EVP_MD_CTX body_digest;
+ EVP_MD_CTX *header_digest;
+ EVP_MD_CTX *body_digest;
DkimCanonicalizer *canon;
/// body length limit. sig-l-tag itself. -1 for unlimited.
long long body_length_limit;
@@ -210,13 +215,23 @@
if (NULL == self->canon) {
goto cleanup;
} // end if
- if (0 == EVP_DigestInit(&(self->header_digest), self->digest_alg)) {
+ if (NULL == (self->header_digest = EVP_MD_CTX_new())) {
+ DkimLogNoResource(self->policy);
+ DkimDigester_free(self);
+ return DSTAT_SYSERR_NORESOURCE;
+ } // end if
+ if (0 == EVP_DigestInit(self->header_digest, self->digest_alg)) {
DkimLogSysError(policy, "Digest Initialization (of header) failed");
DkimDigester_logOpenSSLErrors(self);
SETDEREF(dstat, DSTAT_SYSERR_NORESOURCE);
goto cleanup;
} // end if
- if (0 == EVP_DigestInit(&(self->body_digest), self->digest_alg)) {
+ if (NULL == (self->body_digest = EVP_MD_CTX_new())) {
+ DkimLogNoResource(self->policy);
+ DkimDigester_free(self);
+ return DSTAT_SYSERR_NORESOURCE;
+ } // end if
+ if (0 == EVP_DigestInit(self->body_digest, self->digest_alg)) {
DkimLogSysError(policy, "Digest Initialization (of body) failed");
DkimDigester_logOpenSSLErrors(self);
SETDEREF(dstat, DSTAT_SYSERR_NORESOURCE);
@@ -246,9 +261,14 @@
if (NULL != self->canon) {
DkimCanonicalizer_free(self->canon);
} // end if
- (void) EVP_MD_CTX_cleanup(&(self->header_digest));
- (void) EVP_MD_CTX_cleanup(&(self->body_digest));
+ if (NULL != self->header_digest) {
+ EVP_MD_CTX_free(self->header_digest);
+ }
+ if (NULL != self->body_digest) {
+ EVP_MD_CTX_free(self->body_digest);
+ }
+
// No need to clean up "self->digest_alg"
free(self);
@@ -289,7 +309,7 @@
} // end if
if (0 < srclen) {
- if (0 == EVP_DigestUpdate(&self->body_digest, buf, srclen)) {
+ if (0 == EVP_DigestUpdate(self->body_digest, buf, srclen)) {
DkimLogSysError(self->policy, "Digest update (of body) failed");
DkimDigester_logOpenSSLErrors(self);
return DSTAT_SYSERR_DIGEST_UPDATE_FAILURE;
@@ -360,7 +380,7 @@
// discard errors occurred in functions for debugging
(void) DkimDigester_dumpCanonicalizedHeader(self, canonbuf, canonsize);
- if (0 == EVP_DigestUpdate(&self->header_digest, canonbuf, canonsize)) {
+ if (0 == EVP_DigestUpdate(self->header_digest, canonbuf, canonsize)) {
DkimLogSysError(self->policy, "Digest update (of header) failed");
DkimDigester_logOpenSSLErrors(self);
return DSTAT_SYSERR_DIGEST_UPDATE_FAILURE;
@@ -487,7 +507,7 @@
(void) DkimDigester_dumpCanonicalizedHeader(self, canonbuf, canonsize);
// update digest
- if (0 == EVP_DigestUpdate(&self->header_digest, canonbuf, canonsize)) {
+ if (0 == EVP_DigestUpdate(self->header_digest, canonbuf, canonsize)) {
DkimLogSysError(self->policy, "Digest update (of signature header) failed");
DkimDigester_logOpenSSLErrors(self);
return DSTAT_SYSERR_DIGEST_UPDATE_FAILURE;
@@ -524,9 +544,9 @@
// check if the type of the public key is suitable for the algorithm
// specified by sig-a-tag of the DKIM-Signature header.
- if (publickey->type != self->pubkey_alg) {
+ if (EVP_PKEY_base_id(publickey) != self->pubkey_alg) {
DkimLogPermFail(self->policy, "Public key algorithm mismatch: signature=0x%x, pubkey=0x%x",
- publickey->type, self->pubkey_alg);
+ EVP_PKEY_base_id(publickey), self->pubkey_alg);
return DSTAT_PERMFAIL_PUBLICKEY_TYPE_MISMATCH;
} // end if
@@ -541,7 +561,7 @@
if (DSTAT_OK != ret) {
return ret;
} // end if
- if (0 == EVP_DigestFinal(&self->body_digest, md, &mdlen)) {
+ if (0 == EVP_DigestFinal(self->body_digest, md, &mdlen)) {
DkimLogSysError(self->policy, "Digest finish (of body) failed");
DkimDigester_logOpenSSLErrors(self);
return DSTAT_SYSERR_DIGEST_UPDATE_FAILURE;
@@ -573,7 +593,7 @@
const XBuffer *headerhash = DkimSignature_getSignatureValue(signature);
signbuf = (const unsigned char *) XBuffer_getBytes(headerhash);
signlen = XBuffer_getSize(headerhash);
- int vret = EVP_VerifyFinal(&self->header_digest, signbuf, signlen, publickey);
+ int vret = EVP_VerifyFinal(self->header_digest, signbuf, signlen, publickey);
// EVP_VerifyFinal() returns 1 for a correct signature, 0 for failure and -1 if some other error occurred.
switch (vret) {
case 1: // the signature is correct
@@ -614,10 +634,10 @@
assert(NULL != privatekey);
// XXX signature と self の署名/ダイジェストアルゴリズムが一致しているか確認した方がいい
- if (privatekey->type != self->pubkey_alg) {
+ if (EVP_PKEY_base_id(privatekey) != self->pubkey_alg) {
DkimLogPermFail(self->policy,
"Public key algorithm mismatch: signature=0x%x, privatekey=0x%x",
- privatekey->type, self->pubkey_alg);
+ EVP_PKEY_base_id(privatekey), self->pubkey_alg);
return DSTAT_PERMFAIL_PUBLICKEY_TYPE_MISMATCH;
} // end if
@@ -636,7 +656,7 @@
unsigned char bodyhashbuf[EVP_MD_size(self->digest_alg)]; // EVP_MAX_MD_SIZE instead of EVP_MD_size() is safer(?)
unsigned int bodyhashlen;
bodyhashlen = EVP_MD_size(self->digest_alg);
- if (0 == EVP_DigestFinal(&self->body_digest, bodyhashbuf, &bodyhashlen)) {
+ if (0 == EVP_DigestFinal(self->body_digest, bodyhashbuf, &bodyhashlen)) {
DkimLogSysError(self->policy, "DigestFinal (of body) failed");
DkimDigester_logOpenSSLErrors(self);
return DSTAT_SYSERR_DIGEST_UPDATE_FAILURE;
@@ -676,7 +696,7 @@
unsigned char signbuf[EVP_PKEY_size(privatekey)];
unsigned int signlen;
- if (0 == EVP_SignFinal(&self->header_digest, signbuf, &signlen, privatekey)) {
+ if (0 == EVP_SignFinal(self->header_digest, signbuf, &signlen, privatekey)) {
DkimLogSysError(self->policy, "SignFinal (of body) failed");
DkimDigester_logOpenSSLErrors(self);
return DSTAT_SYSERR_DIGEST_UPDATE_FAILURE;

16
mail/enma/files/patch-libsauth_src_dkimpublickey.c Normal file
View file

@ -0,0 +1,16 @@
--- ./libsauth/src/dkimpublickey.c.org 2018-11-11 18:07:34.804563000 +0900
+++ ./libsauth/src/dkimpublickey.c 2018-11-11 17:48:47.356482000 +0900
@@ -398,11 +398,11 @@
// compare key type key-k-tag declared and stored in key-p-tag
switch (self->keytype) {
case DKIM_KEY_TYPE_RSA:
- if (EVP_PKEY_RSA != EVP_PKEY_type(self->pkey->type)) {
+ if (EVP_PKEY_RSA != EVP_PKEY_base_id(self->pkey)) {
DkimLogPermFail
(policy,
"key-k-tag and key-p-tag doesn't match: domain=%s, keyalg=0x%x, keytype=0x%x",
- domain, self->keytype, EVP_PKEY_type(self->pkey->type));
+ domain, self->keytype, EVP_PKEY_base_id(self->pkey));
SETDEREF(dstat, DSTAT_PERMFAIL_PUBLICKEY_TYPE_MISMATCH);
goto cleanup;
} // end if

4
mail/geary/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= geary
PORTVERSION= 0.12.2
PORTVERSION= 0.12.4
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@ -27,7 +27,7 @@ LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \
libsoup-2.4.so:devel/libsoup \
libenchant.so:textproc/enchant
USES= cmake:outsource compiler:c11 desktop-file-utils gettext libtool \
USES= cmake:outsource compiler:c11 desktop-file-utils gettext gnome libtool \
localbase:ldflags pkgconfig shebangfix sqlite tar:xz
USE_GNOME= cairo gnomedocutils gnomeprefix gtk30 intlhack introspection
SHEBANG_FILES= desktop/geary-attach

6
mail/geary/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1525760008
SHA256 (gnome3/geary-0.12.2.tar.xz) = a9ef2889cf90a44462c374308eef7539193e6703c06fe6c5632e91fa097c4526
SIZE (gnome3/geary-0.12.2.tar.xz) = 1068428
TIMESTAMP = 1542129202
SHA256 (gnome3/geary-0.12.4.tar.xz) = b5224cb3f07d6856acc67b3242785c115fa1bba1f9677267823bdfe9e484d307
SIZE (gnome3/geary-0.12.4.tar.xz) = 1070368

190
mail/geary/files/patch-0d96695 Normal file
View file

@ -0,0 +1,190 @@
https://gitlab.gnome.org/GNOME/geary/issues/37
From 0d966950a2cba888873cd3a7f4f42bb7a017dc6d Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 23 Apr 2018 19:56:18 +0200
Subject: [PATCH] Adjust to upstream javascriptcore-4.0 bindings
---
.../conversation-web-view.vala | 2 +-
src/client/util/util-webkit.vala | 10 +++----
.../web-process/web-process-extension.vala | 17 ++++-------
src/engine/util/util-js.vala | 30 +++++++++++++------
4 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala
index 588d39bd..d8512355 100644
--- src/client/conversation-viewer/conversation-web-view.vala
+++ src/client/conversation-viewer/conversation-web-view.vala
@@ -183,7 +183,7 @@ public class ConversationWebView : ClientWebView {
private void on_deceptive_link_clicked(WebKit.JavascriptResult result) {
try {
- JS.GlobalContext context = result.get_global_context();
+ unowned JS.GlobalContext context = result.get_global_context();
JS.Object details = WebKitUtil.to_object(result);
uint reason = (uint) Geary.JS.to_number(
diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
index 319e28ad..cba9eaf2 100644
--- src/client/util/util-webkit.vala
+++ src/client/util/util-webkit.vala
@@ -18,8 +18,8 @@ namespace WebKitUtil {
*/
public bool to_bool(WebKit.JavascriptResult result)
throws Geary.JS.Error {
- JS.GlobalContext context = result.get_global_context();
- JS.Value value = result.get_value();
+ unowned JS.GlobalContext context = result.get_global_context();
+ unowned JS.Value value = result.get_value();
if (!value.is_boolean(context)) {
throw new Geary.JS.Error.TYPE("Result is not a JS Boolean object");
}
@@ -59,12 +59,12 @@ namespace WebKitUtil {
*/
public string as_string(WebKit.JavascriptResult result)
throws Geary.JS.Error {
- JS.GlobalContext context = result.get_global_context();
- JS.Value js_str_value = result.get_value();
+ unowned JS.GlobalContext context = result.get_global_context();
+ unowned JS.Value js_str_value = result.get_value();
JS.Value? err = null;
JS.String js_str = js_str_value.to_string_copy(context, out err);
Geary.JS.check_exception(context, err);
- return Geary.JS.to_string_released(js_str);
+ return Geary.JS.to_string_released((owned) js_str);
}
/**
diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala
index ee89139d..1f478a6c 100644
--- src/client/web-process/web-process-extension.vala
+++ src/client/web-process/web-process-extension.vala
@@ -87,10 +87,9 @@ public class GearyWebExtension : Object {
bool should_load = false;
WebKit.Frame frame = page.get_main_frame();
// Explicit cast fixes build on s390x/ppc64. Bug 783882
- JS.GlobalContext context = (JS.GlobalContext)
- frame.get_javascript_global_context();
+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
try {
- JS.Value ret = execute_script(
+ unowned JS.Value ret = execute_script(
context, "geary.allowRemoteImages", int.parse("__LINE__")
);
should_load = ret.to_boolean(context);
@@ -106,8 +105,7 @@ public class GearyWebExtension : Object {
private void remote_image_load_blocked(WebKit.WebPage page) {
WebKit.Frame frame = page.get_main_frame();
// Explicit cast fixes build on s390x/ppc64. Bug 783882
- JS.GlobalContext context = (JS.GlobalContext)
- frame.get_javascript_global_context();
+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
try {
execute_script(
context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__")
@@ -123,8 +121,7 @@ public class GearyWebExtension : Object {
private void selection_changed(WebKit.WebPage page) {
WebKit.Frame frame = page.get_main_frame();
// Explicit cast fixes build on s390x/ppc64. Bug 783882
- JS.GlobalContext context = (JS.GlobalContext)
- frame.get_javascript_global_context();
+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
try {
execute_script(
context, "geary.selectionChanged();", int.parse("__LINE__")
@@ -136,20 +133,18 @@ public class GearyWebExtension : Object {
// Return type is nullable as a workaround for Bug 778046, it will
// never actually be null.
- private JS.Value? execute_script(JS.Context context, string script, int line)
+ private unowned JS.Value? execute_script(JS.Context context, string script, int line)
throws Geary.JS.Error {
JS.String js_script = new JS.String.create_with_utf8_cstring(script);
JS.String js_source = new JS.String.create_with_utf8_cstring("__FILE__");
JS.Value? err = null;
try {
- JS.Value ret = context.evaluate_script(
+ unowned JS.Value ret = context.evaluate_script(
js_script, null, js_source, line, out err
);
Geary.JS.check_exception(context, err);
return ret;
} finally {
- js_script.release();
- js_source.release();
}
}
diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala
index 4d224297..ea955e99 100644
--- src/engine/util/util-js.vala
+++ src/engine/util/util-js.vala
@@ -10,6 +10,16 @@
*/
namespace Geary.JS {
+#if !VALA_0_42
+ // Workaround broken version of this in the vala bindings. See Bug
+ // 788113.
+ [CCode (cname = "JSStringGetUTF8CString")]
+ private extern size_t js_string_get_utf8_cstring(
+ global::JS.String js,
+ [CCode (array_length_type = "gsize")] char[] buffer
+ );
+#endif
+
/**
* Errors produced by functions in {@link Geary.JS}.
*/
@@ -72,7 +82,7 @@ namespace Geary.JS {
global::JS.String js_str = value.to_string_copy(context, out err);
Geary.JS.check_exception(context, err);
- return Geary.JS.to_string_released(js_str);
+ return Geary.JS.to_string_released((owned) js_str);
}
/**
@@ -101,12 +111,15 @@ namespace Geary.JS {
/**
* Returns a JSC {@link JS.String} as a Vala {@link string}.
*/
- public inline string to_string_released(global::JS.String js) {
- int len = js.get_maximum_utf8_cstring_size();
- string str = string.nfill(len, 0);
- js.get_utf8_cstring(str, len);
- js.release();
- return str;
+ public inline string to_string_released(owned global::JS.String js) {
+ size_t len = js.get_maximum_utf8_cstring_size();
+ uint8[] str = new uint8[len];
+#if VALA_0_42
+ js.get_utf8_cstring(str);
+#else
+ js_string_get_utf8_cstring(js, (char[]) str);
+#endif
+ return (string) str;
}
/**
@@ -128,7 +141,6 @@ namespace Geary.JS {
try {
Geary.JS.check_exception(context, err);
} finally {
- js_name.release();
}
return prop;
}
@@ -157,7 +169,7 @@ namespace Geary.JS {
throw new Error.EXCEPTION(
"JS exception thrown [%s]: %s"
- .printf(err_type.to_string(), to_string_released(err_str))
+ .printf(err_type.to_string(), to_string_released((owned) err_str))
);
}
}
--
2.18.1

334
mail/geary/files/patch-5d0f711 Normal file
View file

@ -0,0 +1,334 @@
https://gitlab.gnome.org/GNOME/geary/issues/37
From 5d0f711426d76f878cf9b71f7e8f785199c7cde1 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 22 Jun 2017 15:01:19 +0200
Subject: [PATCH] bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0
vapi
---
bindings/metadata/Soup-2.4.metadata | 3 -
bindings/metadata/WebKit2-4.0.metadata | 15 --
.../WebKit2WebExtension-4.0-custom.vala | 5 -
.../metadata/WebKit2WebExtension-4.0.metadata | 9 -
bindings/vapi/javascriptcore-4.0.vapi | 155 ------------------
src/CMakeLists.txt | 39 +----
test/CMakeLists.txt | 2 +-
7 files changed, 4 insertions(+), 224 deletions(-)
delete mode 100644 bindings/metadata/Soup-2.4.metadata
delete mode 100644 bindings/metadata/WebKit2-4.0.metadata
delete mode 100644 bindings/metadata/WebKit2WebExtension-4.0-custom.vala
delete mode 100644 bindings/metadata/WebKit2WebExtension-4.0.metadata
delete mode 100644 bindings/vapi/javascriptcore-4.0.vapi
diff --git a/bindings/metadata/Soup-2.4.metadata b/bindings/metadata/Soup-2.4.metadata
deleted file mode 100644
index f3e72e81..00000000
--- bindings/metadata/Soup-2.4.metadata
+++ /dev/null
@@ -1,3 +0,0 @@
-AuthDomain.accepts skip
-AuthDomain.challenge skip
-
diff --git a/bindings/metadata/WebKit2-4.0.metadata b/bindings/metadata/WebKit2-4.0.metadata
deleted file mode 100644
index 3e3044ff..00000000
--- bindings/metadata/WebKit2-4.0.metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-
-JavascriptResult
- .get_global_context nullable=false unowned=true
- .get_value nullable=false unowned=true
-
-//Forward upstream
-Download
- .failed#signal.error type="WebKit.DownloadError"
-PrintOperation
- .failed#signal.error type="WebKit.PrintError"
-WebResource
- .failed#signal.error type="GLib.Error"
-WebView
- .load_failed#signal.error type="GLib.Error"
- .show_option_menu#signal skip
diff --git a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala b/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
deleted file mode 100644
index a994a774..00000000
--- bindings/metadata/WebKit2WebExtension-4.0-custom.vala
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace WebKit {
- namespace DOM {
- public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event);
- }
-}
diff --git a/bindings/metadata/WebKit2WebExtension-4.0.metadata b/bindings/metadata/WebKit2WebExtension-4.0.metadata
deleted file mode 100644
index c496dba4..00000000
--- bindings/metadata/WebKit2WebExtension-4.0.metadata
+++ /dev/null
@@ -1,9 +0,0 @@
-DOM* parent="WebKit.DOM" name="DOM(.+)"
-
-DOMEventTarget.add_event_listener skip
-_ContextMenu skip
-_ContextMenuItem skip
-
-Frame.get_javascript_* nullable=false unowned=true
-
-DOMEventTarget.add_event_listener_with_closure.handler type="owned WebKit.DOM.EventTargetFunc"
diff --git a/bindings/vapi/javascriptcore-4.0.vapi b/bindings/vapi/javascriptcore-4.0.vapi
deleted file mode 100644
index d152ce2a..00000000
--- bindings/vapi/javascriptcore-4.0.vapi
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2017 Michael Gratton <mike@vee.net>
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later). See the COPYING file in this distribution.
- */
-
-[CCode (cprefix = "JS",
- gir_namespace = "JavaScriptCore",
- gir_version = "4.0",
- lower_case_cprefix = "JS_",
- cheader_filename = "JavaScriptCore/JavaScript.h")]
-namespace JS {
-
- [CCode (cname = "JSContextRef")]
- [SimpleType]
- public struct Context {
-
- [CCode (cname = "JSEvaluateScript")]
- public Value evaluate_script(String script,
- Object? thisObject,
- String? sourceURL,
- int startingLineNumber,
- out Value? exception);
-
- [CCode (cname = "JSCheckScriptSyntax")]
- public Value check_script_syntax(String script,
- String? sourceURL,
- int startingLineNumber,
- out Value? exception);
-
- }
-
- [CCode (cname = "JSGlobalContextRef")]
- [SimpleType]
- public struct GlobalContext : Context {
-
- [CCode (cname = "JSGlobalContextRetain")]
- public bool retain();
-
- [CCode (cname = "JSGlobalContextRelease")]
- public bool release();
-
- }
-
- [CCode (cname = "JSType", has_type_id = false)]
- public enum Type {
-
- [CCode (cname = "kJSTypeUndefined")]
- UNDEFINED,
-
- [CCode (cname = "kJSTypeNull")]
- NULL,
-
- [CCode (cname = "kJSTypeBoolean")]
- BOOLEAN,
-
- [CCode (cname = "kJSTypeNumber")]
- NUMBER,
-
- [CCode (cname = "kJSTypeString")]
- STRING,
-
- [CCode (cname = "kJSTypeObject")]
- OBJECT
- }
-
- [CCode (cname = "JSObjectRef")]
- [SimpleType]
- public struct Object {
-
- [CCode (cname = "JSObjectMakeFunction")]
- public Object.make_function(String? name,
- [CCode (array_length_pos=1.5)]
- String[]? parameterNames,
- String body,
- String? sourceURL,
- int startingLineNumber,
- out Value? exception);
-
- [CCode (cname = "JSObjectCallAsFunction", instance_pos = 1.1)]
- public Value call_as_function(Context ctx,
- Object? thisObject,
- [CCode (array_length_pos=2.5)]
- Value[]? arguments,
- out Value? exception);
-
- [CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)]
- public bool has_property(Context ctx, String property_name);
-
- [CCode (cname = "JSObjectGetProperty", instance_pos = 1.1)]
- public Value get_property(Context ctx,
- String property_name,
- out Value? exception);
-
- }
-
- [CCode (cname = "JSValueRef")]
- [SimpleType]
- public struct Value {
-
- [CCode (cname = "JSValueGetType", instance_pos = 1.1)]
- public Type get_type(Context context);
-
- [CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)]
- public bool is_boolean(Context ctx);
-
- [CCode (cname = "JSValueIsNumber", instance_pos = 1.1)]
- public bool is_number(Context ctx);
-
- [CCode (cname = "JSValueIsObject", instance_pos = 1.1)]
- public bool is_object(Context ctx);
-
- [CCode (cname = "JSValueIsString", instance_pos = 1.1)]
- public bool is_string(Context ctx);
-
- [CCode (cname = "JSValueToBoolean", instance_pos = 1.1)]
- public bool to_boolean(Context ctx);
-
- [CCode (cname = "JSValueToNumber", instance_pos = 1.1)]
- public double to_number(Context ctx, out Value exception);
-
- [CCode (cname = "JSValueToObject", instance_pos = 1.1)]
- public Object to_object(Context ctx, out Value exception);
-
- [CCode (cname = "JSValueToStringCopy", instance_pos = 1.1)]
- public String to_string_copy(Context ctx, out Value exception);
-
- }
-
- [CCode (cname = "JSStringRef")]
- [SimpleType]
- public struct String {
-
- [CCode (cname = "JSStringCreateWithUTF8CString")]
- public String.create_with_utf8_cstring(string str);
-
- [CCode (cname = "JSStringGetLength")]
- public int String.get_length();
-
- [CCode (cname = "JSStringGetMaximumUTF8CStringSize")]
- public int String.get_maximum_utf8_cstring_size();
-
- [CCode (cname = "JSStringGetUTF8CString")]
- public void String.get_utf8_cstring(string* buffer, int bufferSize);
-
- [CCode (cname = "JSStringRetain")]
- public void String.retain();
-
- [CCode (cname = "JSStringRelease")]
- public void String.release();
-
- }
-
-}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e4213fc..e0bebdf7 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -526,7 +526,7 @@ set(ENGINE_PACKAGES
gio-2.0
glib-2.0
gmime-2.6
- javascriptcore-4.0
+ javascriptcoregtk-4.0
libxml-2.0
posix
sqlite3
@@ -551,7 +551,7 @@ set(WEB_PROCESS_PACKAGES
geary-engine
gee-0.8
gtk+-3.0
- javascriptcore-4.0
+ javascriptcoregtk-4.0
libsoup-2.4
webkit2gtk-web-extension-4.0
)
@@ -618,7 +618,6 @@ add_definitions(${CFLAGS})
set(VALAC_OPTIONS
--vapidir=${CMAKE_BINARY_DIR}/src
--vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
- --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
--target-glib=${TARGET_GLIB}
--thread
--debug
@@ -650,38 +649,6 @@ set_property(
)
target_link_libraries(geary-engine m ${DEPS_LIBRARIES} sqlite3-unicodesn)
-# WebKit2GTK VAPI generation
-#################################################
-add_custom_target(webkit2gtk-vapi
- DEPENDS
- "${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi"
- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
-)
-add_custom_command(
- OUTPUT
- ${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi
- DEPENDS
- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2-4.0.metadata"
- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
- WORKING_DIRECTORY
- "${CMAKE_SOURCE_DIR}/bindings/metadata"
- COMMAND
- vapigen --library=webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2-4.0.gir
-)
-add_custom_command(
- OUTPUT
- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
- DEPENDS
- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0.metadata"
- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0-custom.vala"
- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
- WORKING_DIRECTORY
- "${CMAKE_SOURCE_DIR}/bindings/metadata"
- COMMAND
- vapigen --library=webkit2gtk-web-extension-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2WebExtension-4.0.gir WebKit2WebExtension-4.0-custom.vala
-)
-
# Client library (static lib used for building client and unit tests)
#################################################
@@ -698,7 +665,7 @@ OPTIONS
)
add_library(geary-client STATIC ${CLIENT_VALA_C})
-add_dependencies(geary-client resource_copy webkit2gtk-vapi)
+add_dependencies(geary-client resource_copy)
target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine)
# Main client application binary
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index afcca95c..7517b3da 100644
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -56,7 +56,7 @@ set(TEST_PACKAGES
glib-2.0
gmime-2.6
gtk+-3.0
- javascriptcore-4.0
+ javascriptcoregtk-4.0
libsoup-2.4
webkit2gtk-4.0
)
--
2.18.1

72
mail/geary/files/patch-e091f24 Normal file
View file

@ -0,0 +1,72 @@
https://gitlab.gnome.org/GNOME/geary/issues/37
From e091f24b00ec421e1aadd5e360d1550e658ad5ef Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Sun, 20 May 2018 19:07:56 +1000
Subject: [PATCH] Clean up JS util API courtesy the new bindings.
---
src/client/util/util-webkit.vala | 2 +-
src/engine/util/util-js.vala | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
index cba9eaf2..45a27c44 100644
--- src/client/util/util-webkit.vala
+++ src/client/util/util-webkit.vala
@@ -64,7 +64,7 @@ namespace WebKitUtil {
JS.Value? err = null;
JS.String js_str = js_str_value.to_string_copy(context, out err);
Geary.JS.check_exception(context, err);
- return Geary.JS.to_string_released((owned) js_str);
+ return Geary.JS.to_native_string(js_str);
}
/**
diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala
index ea955e99..a98d7985 100644
--- src/engine/util/util-js.vala
+++ src/engine/util/util-js.vala
@@ -82,7 +82,7 @@ namespace Geary.JS {
global::JS.String js_str = value.to_string_copy(context, out err);
Geary.JS.check_exception(context, err);
- return Geary.JS.to_string_released((owned) js_str);
+ return to_native_string(js_str);
}
/**
@@ -111,7 +111,7 @@ namespace Geary.JS {
/**
* Returns a JSC {@link JS.String} as a Vala {@link string}.
*/
- public inline string to_string_released(owned global::JS.String js) {
+ public inline string to_native_string(global::JS.String js) {
size_t len = js.get_maximum_utf8_cstring_size();
uint8[] str = new uint8[len];
#if VALA_0_42
@@ -138,10 +138,8 @@ namespace Geary.JS {
global::JS.String js_name = new global::JS.String.create_with_utf8_cstring(name);
global::JS.Value? err = null;
global::JS.Value prop = object.get_property(context, js_name, out err);
- try {
- Geary.JS.check_exception(context, err);
- } finally {
- }
+ Geary.JS.check_exception(context, err);
+
return prop;
}
@@ -169,7 +167,7 @@ namespace Geary.JS {
throw new Error.EXCEPTION(
"JS exception thrown [%s]: %s"
- .printf(err_type.to_string(), to_string_released((owned) err_str))
+ .printf(err_type.to_string(), to_native_string(err_str))
);
}
}
--
2.18.1

20
mail/imapfilter/files/patch-src_auth.c
View file

@ -1,20 +0,0 @@
--- src/auth.c.orig 2017-11-19 09:38:24 UTC
+++ src/auth.c
@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
unsigned char *resp, *buf, *out;
unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1];
unsigned int mdlen;
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER)
HMAC_CTX *ctx;
#else
HMAC_CTX ctx;
@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
EVP_DecodeBlock(resp, chal, strlen((char *)(chal)));
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER)
ctx = HMAC_CTX_new();
HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
EVP_md5(), NULL);

2
mail/postfix-current/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
DISTVERSION= 3.4-20181105
DISTVERSION= 3.4-20181113
PORTREVISION?= 0
PORTEPOCH= 5
CATEGORIES= mail ipv6

6
mail/postfix-current/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1541464723
SHA256 (postfix/postfix-3.4-20181105.tar.gz) = e66190f80ebbcab6e06a8586f1ff1c42831aad4e5de0b1b8f88ec62b352806a7
SIZE (postfix/postfix-3.4-20181105.tar.gz) = 4492233
TIMESTAMP = 1542155460
SHA256 (postfix/postfix-3.4-20181113.tar.gz) = fa1c69f602847299da0892012df57df9787d2fd705d587d0e4133099b6d2bacb
SIZE (postfix/postfix-3.4-20181113.tar.gz) = 4499186

20
mail/qpopper/Makefile
View file

@ -5,14 +5,22 @@ PORTNAME= qpopper
PORTVERSION= 4.1.0
PORTREVISION= 6
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
http://core.ring.gr.jp/archives/net/mail/qpopper/
MASTER_SITES= http://core.ring.gr.jp/archives/net/mail/qpopper/ \
http://ftp.osuosl.org/.1/blfs/7.7/q/ \
LOCAL/eugen
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= bc979@lafn.org
COMMENT= Berkeley POP 3 server (now maintained by Qualcomm)
# BSD-style license
LICENSE= QUALCOMM
LICENSE_NAME= Qualcomm BSD-style lisense
LICENSE_FILE= ${WRKSRC}/License.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= compiler:features
GNU_CONFIGURE= yes
CONFIGURE_ENV= OS_DEFS="-DSETPROCTITLE ${OS_DEFS}"
CONFIGURE_ARGS= --enable-nonauth-file=${POPUSERS_FILE} \
@ -114,7 +122,7 @@ CONFIGURE_ARGS+= --enable-shy
# without inetd.
.if ${PORT_OPTIONS:MSTANDALONE_MODE}
CONFIGURE_ARGS+= --enable-standalone
USE_RC_SUBR= ${PORTNAME}
USE_RC_SUBR= ${PORTNAME}
.endif
# The default is to build without SSL/TLS support.
@ -122,6 +130,12 @@ USE_RC_SUBR= ${PORTNAME}
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
.endif
# openssl-1.1.1 no longer has SSLv2 support
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085
CFLAGS+= -DOPENSSL_NO_SSL2
CONFIGURE_ARGS+= CFLAGS="${CFLAGS}"
.endif
post-patch:
.if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's|-freg-struct-return||' ${WRKSRC}/configure

5
mail/qpopper/files/patch-popper__pop_tls_openssl.c
View file

@ -32,12 +32,13 @@
case QPOP_TLSv1: /* TLS version 1 only */
DEBUG_LOG0 ( pPOP, "...setting method to TLSv1_server_method" );
@@ -537,7 +547,7 @@ openssl_handshake ( pop_tls *pTLS )
@@ -547,7 +547,8 @@ openssl_handshake ( pop_tls *pTLS )
"%s session-id; cipher: %s (%s), %d bits",
VERSION, SSL_CIPHER_get_version(ciph),
pTLS->m_pPOP->client, pTLS->m_pPOP->ipaddr,
- ( pTLS->m_OpenSSLconn->hit ? "reused" : "new" ),
+ ( SSL_CTX_sess_hits(pTLS->m_OpenSSLconn) ? "reused" : "new" ),
+ ( SSL_session_reused(pTLS->m_OpenSSLconn) ?
+ "reused" : "new" ),
( ciph_name != NULL ? ciph_name : "(none)" ),
get_cipher_description ( ciph, buf, sizeof(buf) ),
SSL_CIPHER_get_bits ( ciph, &al_bits ) );

11
mail/spamassassin/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= spamassassin
PORTVERSION= 3.4.2
PORTREVISION?= 1 # also bump japanese/spamassassin
PORTREVISION?= 2 # also bump japanese/spamassassin
CATEGORIES?= mail perl5
MASTER_SITES= APACHE/spamassassin/source CPAN/Mail
DISTNAME= Mail-SpamAssassin-${PORTVERSION}
@ -24,8 +24,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
p5-URI>=0:net/p5-URI \
re2c>=.12.0:devel/re2c
USES= cpe perl5
.for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL
TEST_DEPENDS+= ${${dep}_RUN_DEPENDS}
.endfor
@ -34,6 +32,7 @@ CONFLICTS?= ja-spamassassin-[0-9]*
CPE_VENDOR= apache
USES= cpe perl5
USE_PERL5= configure
USE_LDCONFIG= yes
@ -56,7 +55,7 @@ OPTIONS_GROUP_DATABASE= MYSQL PGSQL
OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY
OPTIONS_SINGLE= GPG
OPTIONS_SINGLE_GPG= GNUPG_NONE GNUPG GNUPG2
OPTIONS_DEFAULT= AS_ROOT DKIM GNUPG2 SSL SPF_QUERY
OPTIONS_DEFAULT= AS_ROOT DKIM GNUPG SSL SPF_QUERY
AS_ROOT_DESC= Run spamd as root (recommended)
@ -176,8 +175,4 @@ post-install::
${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql ldap" ${STAGEDIR}${DOCSDIR})
post-install-GNUPG2-on:
${MKDIR} ${STAGEDIR}/${ETCDIR}/sa-update-keys
${ECHO} "no-secmem-warning" >${STAGEDIR}/${ETCDIR}/sa-update-keys/gpg.conf
.include <bsd.port.post.mk>

1
mail/spamassassin/pkg-plist
View file

@ -16,7 +16,6 @@ bin/spamd
@sample %%ETCDIR%%/v340.pre.sample
@sample %%ETCDIR%%/v341.pre.sample
@sample %%ETCDIR%%/v342.pre.sample
%%GNUPG2%%%%ETCDIR%%/sa-update-keys/gpg.conf
include/libspamc.h
lib/libspamc.so
lib/libspamc.so.0

2
net-mgmt/netdisco/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= netdisco
DISTVERSION= 2.039031
DISTVERSION= 2.039033
CATEGORIES= net-mgmt perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:OLIVER

6
net-mgmt/netdisco/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1529756936
SHA256 (App-Netdisco-2.039031.tar.gz) = 3f7e367cea3dbdf8ca3e6a9ddda5e24406d3636b5b3b068b6a7d81477b0db483
SIZE (App-Netdisco-2.039031.tar.gz) = 957401
TIMESTAMP = 1542192638
SHA256 (App-Netdisco-2.039033.tar.gz) = 8027d845e3d92defc8b66d4433cb2bc59ff19eeaf1139ccd2d46b1b4d7f30c38
SIZE (App-Netdisco-2.039033.tar.gz) = 958061

3
net/py-sbws/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= sbws
PORTVERSION= 1.0.2
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -17,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=1.6.8:net/py-pysocks@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}stem>=1.7.0:security/py-stem@${PY_FLAVOR} \
tor:security/tor
USES= cpe python:3.4+ shebangfix
USES= cpe python:3.5+ shebangfix
USE_GITHUB= yes
USE_PYTHON= autoplist distutils concurrent flavors

3
net/qt5-network/Makefile
View file

@ -8,9 +8,6 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt network module
BROKEN_SSL= openssl111
BROKEN_SSL_REASON_openssl111= error: member access into incomplete type 'X509' (aka 'x509_st')
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base ssl

7
news/newsx/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= newsx
PORTVERSION= 1.6
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= news
MASTER_SITES= http://www.kvaleberg.org/pub/
@ -15,7 +15,8 @@ LICENSE= GPLv2
.if defined(WITH_CNEWS)
BUILD_DEPENDS= ${LOCALBASE}/news/lib/libcnews.a:news/cnews
.elif !defined(WITHOUT_INN_2-X)
BUILD_DEPENDS= ${LOCALBASE}/news/lib/libinn.a:news/inn
BUILD_DEPENDS= ${LOCALBASE}/news/lib/libinn.so:news/inn
RUN_DEPENDS= ${LOCALBASE}/news/lib/libinn.so:news/inn
.endif
GNU_CONFIGURE= yes
@ -26,7 +27,7 @@ OPTIONS_DEFINE= DOCS
.if !defined(WITH_CNEWS)
.if !defined(WITHOUT_INN_2-X)
CPPFLAGS+= -I${LOCALBASE}/news/include
CPPFLAGS+= -I${LOCALBASE}/news/include/inn
.endif
.endif

Some files were not shown because too many files have changed in this diff Show more