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-10-15 17:35:46 +02:00
parent de585c1181
commit ea8631aad0
320 changed files with 2212 additions and 2316 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archivers/py-lz4/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lz4
PORTVERSION= 2.1.0
PORTVERSION= 2.1.1
CATEGORIES= archivers python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -20,8 +20,8 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
USE_PYTHON= distutils py3kplist
USES= python
USE_PYTHON= distutils py3kplist
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/_version.so \

6
archivers/py-lz4/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535013578
SHA256 (lz4-2.1.0.tar.gz) = 166aff2fbb2fee39f4ed58e8e7c1ed8a8ce72915832a100ced7a1634ac655a6f
SIZE (lz4-2.1.0.tar.gz) = 127531
TIMESTAMP = 1539634920
SHA256 (lz4-2.1.1.tar.gz) = af46e2e5c002b3fbffa2ad69289aa61e46cab1a87c1d85bda44e822a1634defa
SIZE (lz4-2.1.1.tar.gz) = 128498

2
audio/fasttracker2/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fasttracker2
DISTVERSION= 0.1-b99
DISTVERSION= 0.1-b109
CATEGORIES= audio
MASTER_SITES= https://16-bits.org/ \
LOCAL/ehaupt

6
audio/fasttracker2/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537451742
SHA256 (ft2clone-b99-code.zip) = 8c7f76ec7411a9f7eae26e160d8ee6e165c7fb3b345beaa136046149a750f66a
SIZE (ft2clone-b99-code.zip) = 4562580
TIMESTAMP = 1539677136
SHA256 (ft2clone-b109-code.zip) = 579bb70bd9fefea54523eb6cfe02f4695fd3b57c9c27aa1e7678aec5eccf570c
SIZE (ft2clone-b109-code.zip) = 3868936

6
audio/libopenmpt/Makefile
View file

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= libopenmpt
PORTVERSION= 0.3.11
PORTVERSION= 0.3.12
DISTVERSIONSUFFIX= +release.autotools
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://lib.openmpt.org/files/libopenmpt/src/ \
LOCAL/ehaupt
@ -16,9 +15,10 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= gmake libtool pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-portaudiocpp
OPTIONS_DEFINE= DOCS EXAMPLES FLAC MPG123 OGG PORTAUDIO SNDFILE VORBIS

6
audio/libopenmpt/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1536696218
SHA256 (libopenmpt-0.3.11+release.autotools.tar.gz) = df1ec44212e9f73b33d5aa4970cf3fb7ce27c9fef88d1d1a8be79271c4c705e6
SIZE (libopenmpt-0.3.11+release.autotools.tar.gz) = 1412893
TIMESTAMP = 1539601768
SHA256 (libopenmpt-0.3.12+release.autotools.tar.gz) = 7134db999d33b96dc2db13dbaf29b7beeb4c58f62e57fd3caf36bb8428aa4b42
SIZE (libopenmpt-0.3.12+release.autotools.tar.gz) = 1414196

3
audio/puddletag/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= puddletag
PORTVERSION= 1.2.0
DISTVERSIONPREFIX=v
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio python
MAINTAINER= multimedia@FreeBSD.org
@ -13,7 +13,6 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= chromaprint>=0.4:audio/chromaprint \
${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing@${PY_FLAVOR}

3
audio/py-musicbrainz2/Makefile
View file

@ -16,6 +16,9 @@ COMMENT= Next Generation Python bindings for MusicBrainz
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.txt
DEPRECATED= Musicbrainz Web Service 1.0 support ended 2018-08-01
EXPIRATION_DATE= 2018-10-28
LIB_DEPENDS= libdiscid.so:audio/libdiscid
USES= python:2.7

2
audio/py-musicbrainzngs/Makefile
View file

@ -7,7 +7,7 @@ CATEGORIES= audio python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= jhale@FreeBSD.org
COMMENT= Python Musicbrainz NGS site bindings
LICENSE= BSD2CLAUSE ISCL

2
audio/qsynth/Makefile
View file

@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
USES= gmake pkgconfig qt:5
USES= compiler:c++11-lang gmake pkgconfig qt:5
USE_CXXSTD= c++11
USE_QT= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
USE_GL= gl

25
audio/xmms2/files/patch-src_plugins_airplay_raop__client.c Normal file
View file

@ -0,0 +1,25 @@
--- src/plugins/airplay/raop_client.c.orig 2011-10-20 19:26:08 UTC
+++ src/plugins/airplay/raop_client.c
@@ -1,6 +1,8 @@
#include <string.h>
#include <unistd.h>
+#include <openssl/opensslv.h>
+#include <openssl/ossl_typ.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/bio.h>
@@ -137,8 +139,13 @@ raop_rsa_encrypt (guchar *text, gint len, guchar *res)
static const guchar exp[] = {0x01, 0x00, 0x01};
rsa = RSA_new ();
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
rsa->n = BN_bin2bn (mod, 256, NULL);
rsa->e = BN_bin2bn (exp, 3, NULL);
+#else
+ RSA_set0_key(rsa, BN_bin2bn (mod, 256, NULL), BN_bin2bn (exp, 3, NULL), NULL);
+#endif
size = RSA_public_encrypt (len, text, res, rsa, RSA_PKCS1_OAEP_PADDING);

3
benchmarks/apib/Makefile
View file

@ -26,6 +26,9 @@ PORTEXAMPLES= env.sh pivot run.sh rungroup.sh tojson
OPTIONS_DEFINE= EXAMPLES
post-patch:
@${REINPLACE_CMD} -e 's, LIBS="-lssl,& -lcrypto,' ${WRKSRC}/configure
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/apib ${WRKSRC}/apibmon \
${STAGEDIR}${PREFIX}/bin

10
benchmarks/vegeta/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= vegeta
DISTVERSIONPREFIX= cli/v
DISTVERSION= 11.3.0
DISTVERSION= 12.0.0
CATEGORIES= benchmarks www
MAINTAINER= egypcio@googlemail.com
@ -11,8 +11,6 @@ COMMENT= HTTP load testing tool and library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
PLIST_FILES= bin/${PORTNAME}
USES= go
USE_GITHUB= yes
@ -22,7 +20,7 @@ GH_TUPLE= alecthomas:jsonschema:f2c9385:jsonschema/github.com/alecthomas/jsonsch
bmizerany:perks:d9a9656:perks/github.com/bmizerany/perks \
dgryski:go-gk:201884a:gogk/github.com/dgryski/go-gk \
dgryski:go-lttb:318fcdf:golttb/github.com/dgryski/go-lttb \
google:go-cmp:3af367b:gocmp/github.com/google/go-cmp \
google:go-cmp:v0.2.0:gocmp/github.com/google/go-cmp \
influxdata:tdigest:a7d76c6:tdigest/github.com/influxdata/tdigest \
mailru:easyjson:60711f1:easyjson/github.com/mailru/easyjson \
shurcooL:httpfs:809bece:httpfs/github.com/shurcooL/httpfs \
@ -30,7 +28,9 @@ GH_TUPLE= alecthomas:jsonschema:f2c9385:jsonschema/github.com/alecthomas/jsonsch
streadway:quantile:b0c5887:quantile/github.com/streadway/quantile \
tsenart:go-tsz:cdeb9e1:gotsz/github.com/tsenart/go-tsz \
golang:net:c394268:net/golang.org/x/net \
golang:text:f21a4df:text/golang.org/x/text
golang:text:v0.3.0:text/golang.org/x/text
PLIST_FILES= bin/${PORTNAME}
do-build:
@${MKDIR} ${WRKSRC}/github.com/${GH_ACCOUNT}

14
benchmarks/vegeta/distinfo
View file

@ -1,6 +1,6 @@
TIMESTAMP = 1535818242
SHA256 (tsenart-vegeta-cli-v11.3.0_GH0.tar.gz) = 37c37f8ea03f3a952c40fd3530a4454ea5c9dbd62fe9b1427032249e6d80c45b
SIZE (tsenart-vegeta-cli-v11.3.0_GH0.tar.gz) = 478664
TIMESTAMP = 1539334010
SHA256 (tsenart-vegeta-cli-v12.0.0_GH0.tar.gz) = 808266795af26cfb05d29da3823fdb2e82514a2a1bc36a102fff83bc0e1476b9
SIZE (tsenart-vegeta-cli-v12.0.0_GH0.tar.gz) = 478781
SHA256 (alecthomas-jsonschema-f2c9385_GH0.tar.gz) = e95ce4279470c9da271c494ac9b00fc6c3c8975c9e685ca4ae926a6201deaab1
SIZE (alecthomas-jsonschema-f2c9385_GH0.tar.gz) = 7341
SHA256 (c2h5oh-datasize-4eba002_GH0.tar.gz) = c0e504d28864f6c25eb09afcf292aea5a7499df3b2d3e13a9ddecd3bc5ef98ae
@ -11,8 +11,8 @@ SHA256 (dgryski-go-gk-201884a_GH0.tar.gz) = 63c4d18cc962124fdcf57df7af3d9d009f44
SIZE (dgryski-go-gk-201884a_GH0.tar.gz) = 2733
SHA256 (dgryski-go-lttb-318fcdf_GH0.tar.gz) = 46a44a5c5098d39b7d8299ceb5d3f0226713cfe3d0afeb7db1f0c2faab1cb3f1
SIZE (dgryski-go-lttb-318fcdf_GH0.tar.gz) = 98314
SHA256 (google-go-cmp-3af367b_GH0.tar.gz) = a95656f396bd9f27df422aa4ba802c36c65e4598438fe5fe7e7492d3a99c31ac
SIZE (google-go-cmp-3af367b_GH0.tar.gz) = 57876
SHA256 (google-go-cmp-v0.2.0_GH0.tar.gz) = 3c4e5aca9a707eb19f5ef54b13171f3d36466f4cab73918d111bd93c88b62eed
SIZE (google-go-cmp-v0.2.0_GH0.tar.gz) = 57862
SHA256 (influxdata-tdigest-a7d76c6_GH0.tar.gz) = 96e4da462ba27e316a6e07ae48ea63032a042411119c03c18806bf252c86632c
SIZE (influxdata-tdigest-a7d76c6_GH0.tar.gz) = 15706
SHA256 (mailru-easyjson-60711f1_GH0.tar.gz) = 8fd44e1503cb852cc6dd98d1b7646ad8d3abdb739754cc2254e5057b0a947ca6
@ -27,5 +27,5 @@ SHA256 (tsenart-go-tsz-cdeb9e1_GH0.tar.gz) = 8a94fbd29d173fe6351693d9358aabd903c
SIZE (tsenart-go-tsz-cdeb9e1_GH0.tar.gz) = 260644
SHA256 (golang-net-c394268_GH0.tar.gz) = b3592668b46bfd15cecea395c3efd2124abce92f08b857cec3a4012d5a33151a
SIZE (golang-net-c394268_GH0.tar.gz) = 968640
SHA256 (golang-text-f21a4df_GH0.tar.gz) = 1964956fab6356e201ace777f0e221334a9023777373768a853efc300df2219c
SIZE (golang-text-f21a4df_GH0.tar.gz) = 6102640
SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619

2
biology/iqtree/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= iqtree
DISTVERSIONPREFIX= v
DISTVERSION= 1.6.7
DISTVERSION= 1.6.7.1
CATEGORIES= biology
MAINTAINER= jrm@FreeBSD.org

6
biology/iqtree/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535308947
SHA256 (Cibiv-IQ-TREE-v1.6.7_GH0.tar.gz) = 706278a133f194d7c07aa2d2429459c4d494029628dcd511dbf434d171131f01
SIZE (Cibiv-IQ-TREE-v1.6.7_GH0.tar.gz) = 4857869
TIMESTAMP = 1539696708
SHA256 (Cibiv-IQ-TREE-v1.6.7.1_GH0.tar.gz) = c3ee09a7c77228d28907fcb2d97784e2791360f2b20e29890269e1339fa5846a
SIZE (Cibiv-IQ-TREE-v1.6.7.1_GH0.tar.gz) = 4863996

1
cad/dinotrace/Makefile
View file

@ -12,6 +12,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical signal trace waveform viewer
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake motif perl5 tar:tgz
USE_XORG= x11 sm ice xmu xt

2
cad/dinotrace/pkg-descr
View file

@ -7,4 +7,4 @@ Equipment Corporation, who wrote the code and supported it through version 4.2.
When created, it was the first graphical display tool for the simulators being
designed at Digital.
WWW: http://www.veripool.org/wiki/dinotrace
WWW: https://www.veripool.org/wiki/dinotrace

3
chinese/ibus-libpinyin/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ibus-libpinyin
PORTVERSION= 1.7.2
PORTREVISION= 3
PORTVERSION= 1.10.0
CATEGORIES= chinese
MASTER_SITES= SF/libpinyin/${PORTNAME}

5
chinese/ibus-libpinyin/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (ibus-libpinyin-1.7.2.tar.gz) = 61b33e673b4dcb09b6d8fa9eac07061fdbe21c1e4efebeada0a4d04a03797b4a
SIZE (ibus-libpinyin-1.7.2.tar.gz) = 1044655
TIMESTAMP = 1539584534
SHA256 (ibus-libpinyin-1.10.0.tar.gz) = 6cc4f80d2348f93ed408d52fb33b45736f51ae33335a869e8a3bb6460957087b
SIZE (ibus-libpinyin-1.10.0.tar.gz) = 1081199

3
chinese/ibus-libpinyin/pkg-plist
View file

@ -1,3 +1,4 @@
%%NLS%%share/locale/ca/LC_MESSAGES/ibus-libpinyin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/ibus-libpinyin.mo
%%NLS%%share/locale/ru/LC_MESSAGES/ibus-libpinyin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-libpinyin.mo
@ -8,6 +9,7 @@ libexec/ibus-setup-libpinyin
share/appdata/libpinyin.appdata.xml
share/applications/ibus-setup-libbopomofo.desktop
share/applications/ibus-setup-libpinyin.desktop
share/glib-2.0/schemas/com.github.libpinyin.ibus-libpinyin.gschema.xml
%%ENGLISH%%%%DATADIR%%/db/english.db
%%STROKE%%%%DATADIR%%/db/strokes.db
%%DATADIR%%/icons/chinese.svg
@ -20,7 +22,6 @@ share/applications/ibus-setup-libpinyin.desktop
%%DATADIR%%/icons/ibus-pinyin.svg
%%DATADIR%%/icons/simp-chinese.svg
%%DATADIR%%/icons/trad-chinese.svg
%%DATADIR%%/phrases.txt
%%DATADIR%%/setup/config.py
%%DATADIR%%/setup/config.pyc
%%DATADIR%%/setup/config.pyo

4
chinese/libpinyin/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libpinyin
PORTVERSION= 1.2.0
PORTVERSION= 2.2.0
CATEGORIES= chinese textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
@ -24,6 +24,6 @@ INSTALL_TARGET=install-strip
PLIST_SUB+= VER=${PORTVERSION}
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpinyin.so.6.0.0
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpinyin.so.13.0.0
.include <bsd.port.mk>

5
chinese/libpinyin/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (libpinyin-1.2.0.tar.gz) = ffabc0c7034a43f29c9427de16012c6d1154dea3524298631fd2ba63014d025f
SIZE (libpinyin-1.2.0.tar.gz) = 17356384
TIMESTAMP = 1539587914
SHA256 (libpinyin-2.2.0.tar.gz) = f22144418031f48784ea4b417927e935424bb6767a63ceea107377b9d9ee9cb0
SIZE (libpinyin-2.2.0.tar.gz) = 19602224

5
chinese/libpinyin/pkg-plist
View file

@ -6,8 +6,8 @@ include/libpinyin-%%VER%%/pinyin.h
include/libpinyin-%%VER%%/pinyin_custom2.h
lib/libpinyin.a
lib/libpinyin.so
lib/libpinyin.so.6
lib/libpinyin.so.6.0.0
lib/libpinyin.so.13
lib/libpinyin.so.13.0.0
libdata/pkgconfig/libpinyin.pc
man/man1/libpinyin.1.gz
%%DATADIR%%/data/addon_phrase_index.bin
@ -23,6 +23,7 @@ man/man1/libpinyin.1.gz
%%DATADIR%%/data/life.bin
%%DATADIR%%/data/merged.bin
%%DATADIR%%/data/nature.bin
%%DATADIR%%/data/opengram.bin
%%DATADIR%%/data/people.bin
%%DATADIR%%/data/phrase_index.bin
%%DATADIR%%/data/pinyin_index.bin

1
deskutils/Makefile
View file

@ -269,7 +269,6 @@
SUBDIR += synapse
SUBDIR += syncthing-gtk
SUBDIR += systempreferences
SUBDIR += tagutils
SUBDIR += taskcoach
SUBDIR += taskd
SUBDIR += tasksh

19
deskutils/pinot/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= pinot
PORTVERSION= 1.09
PORTREVISION= 12
PORTREVISION= 13
CATEGORIES= deskutils
MAINTAINER= thierry@FreeBSD.org
@ -21,6 +21,7 @@ LIB_DEPENDS= libxapian.so:databases/xapian-core \
libdbus-1.so:devel/dbus \
libxml++-2.6.so:textproc/libxml++26 \
libboost_thread.so:devel/boost-libs \
libnotify.so:devel/libnotify \
libexif.so:graphics/libexif \
libexiv2.so:graphics/exiv2 \
libgmime-2.4.so:mail/gmime24 \
@ -41,14 +42,7 @@ GH_TAGNAME= c14d6d5
USE_HARDENING= pie:off relro:off
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive \
--enable-mempool=no
CONFIGURE_ENV= MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0"
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lboost_system
USES= compiler:c++11-lang autoreconf gettext libarchive \
USES= compiler:c++11-lang autoreconf gettext gnome libarchive \
libtool pkgconfig python shebangfix sqlite:3 ssl
USE_CXXSTD= c++11
USE_XORG= pixman
@ -56,6 +50,13 @@ USE_GNOME= atkmm cairo cairomm glibmm gtk20 gtkmm24 libsigc++20 libxml2 pangomm
USE_LDCONFIG= ${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
SHEBANG_FILES= scripts/bash/*.sh
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive \
--enable-mempool=no --enable-libnotify
CONFIGURE_ENV= MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0"
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lboost_system
OPTIONS_DEFINE= DEBUG CHMLIB DOCS
OPTIONS_SUB= yes

102
deskutils/pinot/files/patch-openssl Normal file
View file

@ -0,0 +1,102 @@
Description: Catch up with current glib and OpenSSL
Author: FabriceColin <fabrice.colin@gmail.com>
Bug-Debian: https://bugs.debian.org/828503
Forwarded: yes
Last-Update: 2018-06-14
diff --git Collect/DownloaderInterface.cpp Collect/DownloaderInterface.cpp
index 10f4f66..f084f50 100644
--- Collect/DownloaderInterface.cpp
+++ Collect/DownloaderInterface.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Fabrice Colin
+ * Copyright 2005-2017 Fabrice Colin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -33,7 +33,8 @@ using namespace std;
#ifdef USE_SSL
// OpenSSL multi-thread support, required by Curl
-static pthread_mutex_t locksTable[CRYPTO_NUM_LOCKS];
+static unsigned int g_lockArrayCount = 0;
+static pthread_mutex_t *g_pLockArray = NULL;
// OpenSSL locking functiom
static void lockingCallback(int mode, int n, const char *file, int line)
@@ -42,7 +43,7 @@ static void lockingCallback(int mode, int n, const char *file, int line)
if (mode & CRYPTO_LOCK)
{
- status = pthread_mutex_lock(&(locksTable[n]));
+ status = pthread_mutex_lock(&(g_pLockArray[n]));
#ifdef DEBUG
if (status != 0)
{
@@ -52,7 +53,7 @@ static void lockingCallback(int mode, int n, const char *file, int line)
}
else
{
- status = pthread_mutex_unlock(&(locksTable[n]));
+ status = pthread_mutex_unlock(&(g_pLockArray[n]));
#ifdef DEBUG
if (status != 0)
{
@@ -82,9 +83,15 @@ void DownloaderInterface::initialize(void)
pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_ERRORCHECK);
// Initialize the OpenSSL mutexes
- for (unsigned int lockNum = 0; lockNum < CRYPTO_NUM_LOCKS; ++lockNum)
+#ifdef CRYPTO_num_locks
+ g_lockArrayCount = CRYPTO_num_locks();
+#else
+ g_lockArrayCount = CRYPTO_NUM_LOCKS;
+#endif
+ g_pLockArray = (pthread_mutex_t *)OPENSSL_malloc(g_lockArrayCount * sizeof(pthread_mutex_t));
+ for (unsigned int lockNum = 0; lockNum < g_lockArrayCount; ++lockNum)
{
- pthread_mutex_init(&(locksTable[lockNum]), &mutexAttr);
+ pthread_mutex_init(&(g_pLockArray[lockNum]), &mutexAttr);
}
// Set the callbacks
CRYPTO_set_locking_callback(lockingCallback);
@@ -103,10 +110,13 @@ void DownloaderInterface::shutdown(void)
CRYPTO_set_locking_callback(NULL);
// Free the mutexes
- for (unsigned int lockNum = 0; lockNum < CRYPTO_NUM_LOCKS; ++lockNum)
+ for (unsigned int lockNum = 0; lockNum < g_lockArrayCount; ++lockNum)
{
- pthread_mutex_destroy(&(locksTable[lockNum]));
+ pthread_mutex_destroy(&(g_pLockArray[lockNum]));
}
+ OPENSSL_free(g_pLockArray);
+ g_pLockArray = NULL;
+ g_lockArrayCount = 0;
#endif
}
diff --git Utils/MIMEScanner.cpp Utils/MIMEScanner.cpp
index e02215c..50ceb3d 100644
--- Utils/MIMEScanner.cpp
+++ Utils/MIMEScanner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2012 Fabrice Colin
+ * Copyright 2005-2017 Fabrice Colin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -456,9 +456,10 @@ MIMEScanner::~MIMEScanner()
bool MIMEScanner::initialize(const string &userPrefix, const string &systemPrefix)
{
#ifdef USE_GIO
+#if !GLIB_CHECK_VERSION(2,35,0)
// Initialize the GType system
g_type_init();
-
+#endif
return true;
#else
list<string> desktopFilesPaths;

25
deskutils/tagutils/Makefile
View file

@ -1,25 +0,0 @@
# Created by: Khairil Yusof <kaeru@inigo-tech.com>
# $FreeBSD$
PORTNAME= tagutils
PORTVERSION= 0.3.0
PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://releases.chipx86.com/leaftag/tagutils/
MAINTAINER= ports@FreeBSD.org
COMMENT= Command line tool for tagging files
DEPRECATED= Unmaintained upstream
EXPIRATION_DATE= 2018-10-15
LIB_DEPENDS= libleaftag.so:devel/libleaftag
GNU_CONFIGURE= yes
USES= gmake pathfix pkgconfig
USE_GNOME= glib20
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>

2
deskutils/tagutils/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (tagutils-0.3.0.tar.gz) = 0d12dc57d7e49bddf835f233d2a0726e0c0ca5a5dafbcbb62bec7c93a41dae10
SIZE (tagutils-0.3.0.tar.gz) = 151036

8
deskutils/tagutils/pkg-descr
View file

@ -1,8 +0,0 @@
Leaftag is a library and set of utilities for tagging files on the desktop.
tagutils is the primary way of tagging files from the command line.
It can tag, untag, display a list of known tags, manipulate tag properties,
and show files belonging to a tag.
Project homepage:
WWW: http://www.chipx86.com/wiki/Leaftag

6
deskutils/tagutils/pkg-plist
View file

@ -1,6 +0,0 @@
bin/tag
bin/tagls
bin/tagprop
bin/tags
bin/tagutils
bin/untag

1
devel/Makefile
View file

@ -1490,7 +1490,6 @@
SUBDIR += liblangtag
SUBDIR += liblas
SUBDIR += liblas12
SUBDIR += libleaftag
SUBDIR += liblnk
SUBDIR += liblockfile
SUBDIR += liblogging

2
devel/android-tools-adb/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= android-tools-adb
DISTVERSIONPREFIX= android-
DISTVERSION?= 9.0.0_r3
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= devel comms
MAINTAINER= jbeich@FreeBSD.org

183
devel/android-tools-adb/files/patch-libcrypto__utils_android__pubkey.c
View file

@ -1,14 +1,101 @@
--- libcrypto_utils/android_pubkey.c.orig 2016-04-16 00:01:39 UTC
+++ libcrypto_utils/android_pubkey.c
@@ -110,6 +110,76 @@ cleanup:
@@ -61,10 +61,49 @@ static void reverse_bytes(uint8_t* buffer, size_t size
}
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+// http://github.com/google/boringssl/commit/5a91503826ad
+static void RSA_get0_key(const RSA *rsa, const BIGNUM **out_n, const BIGNUM **out_e,
+ const BIGNUM **out_d) {
+ if (out_n != NULL) {
+ *out_n = rsa->n;
+ }
+ if (out_e != NULL) {
+ *out_e = rsa->e;
+ }
+ if (out_d != NULL) {
+ *out_d = rsa->d;
+ }
+}
+
+static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
+ if ((rsa->n == NULL && n == NULL) ||
+ (rsa->e == NULL && e == NULL)) {
+ return 0;
+ }
+
+ if (n != NULL) {
+ BN_free(rsa->n);
+ rsa->n = n;
+ }
+ if (e != NULL) {
+ BN_free(rsa->e);
+ rsa->e = e;
+ }
+ if (d != NULL) {
+ BN_free(rsa->d);
+ rsa->d = d;
+ }
+
+ return 1;
+}
+#endif
+
bool android_pubkey_decode(const uint8_t* key_buffer, size_t size, RSA** key) {
const RSAPublicKey* key_struct = (RSAPublicKey*)key_buffer;
bool ret = false;
uint8_t modulus_buffer[ANDROID_PUBKEY_MODULUS_SIZE];
+ BIGNUM *new_key_n, *new_key_e;
RSA* new_key = RSA_new();
if (!new_key) {
goto cleanup;
@@ -81,14 +120,14 @@ bool android_pubkey_decode(const uint8_t* key_buffer,
// Convert the modulus to big-endian byte order as expected by BN_bin2bn.
memcpy(modulus_buffer, key_struct->modulus, sizeof(modulus_buffer));
reverse_bytes(modulus_buffer, sizeof(modulus_buffer));
- new_key->n = BN_bin2bn(modulus_buffer, sizeof(modulus_buffer), NULL);
- if (!new_key->n) {
+ new_key_n = BN_bin2bn(modulus_buffer, sizeof(modulus_buffer), NULL);
+ if (!new_key_n) {
goto cleanup;
}
// Read the exponent.
- new_key->e = BN_new();
- if (!new_key->e || !BN_set_word(new_key->e, key_struct->exponent)) {
+ new_key_e = BN_new();
+ if (!new_key_e || !BN_set_word(new_key_e, key_struct->exponent)) {
goto cleanup;
}
@@ -100,6 +139,7 @@ bool android_pubkey_decode(const uint8_t* key_buffer,
// be added here if/when we want the additional speedup from using the
// pre-computed montgomery parameters.
+ RSA_set0_key(new_key, new_key_n, new_key_e, NULL);
*key = new_key;
ret = true;
@@ -110,6 +150,83 @@ cleanup:
return ret;
}
+#if !defined(OPENSSL_IS_BORINGSSL)
+// https://android.googlesource.com/platform/external/chromium_org/third_party/boringssl/src/+/6887edb%5E!/
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+struct bignum_st {
+ BN_ULONG *d; /* Pointer to an array of 'BN_BITS2' bit chunks in little-endian
+ order. */
+ int top; // Index of last used element in |d|, plus one.
+ int dmax; // Size of |d|, in words.
+ int neg; // one if the number is negative
+ int flags; // bitmask of BN_FLG_* values
+};
+#endif
+
+/* constant_time_select_ulong returns |x| if |v| is 1 and |y| if |v| is 0. Its
+ * behavior is undefined if |v| takes any other value. */
+// constant_time_select_ulong returns |x| if |v| is 1 and |y| if |v| is 0. Its
+// behavior is undefined if |v| takes any other value.
+static BN_ULONG constant_time_select_ulong(int v, BN_ULONG x, BN_ULONG y) {
+ BN_ULONG mask = v;
+ mask--;
@ -16,58 +103,55 @@
+ return (~mask & x) | (mask & y);
+}
+
+/* constant_time_le_size_t returns 1 if |x| <= |y| and 0 otherwise. |x| and |y|
+ * must not have their MSBs set. */
+// constant_time_le_size_t returns 1 if |x| <= |y| and 0 otherwise. |x| and |y|
+// must not have their MSBs set.
+static int constant_time_le_size_t(size_t x, size_t y) {
+ return ((x - y - 1) >> (sizeof(size_t) * 8 - 1)) & 1;
+}
+
+/* read_word_padded returns the |i|'th word of |in|, if it is not out of
+ * bounds. Otherwise, it returns 0. It does so without branches on the size of
+ * |in|, however it necessarily does not have the same memory access pattern. If
+ * the access would be out of bounds, it reads the last word of |in|. |in| must
+ * not be zero. */
+// read_word_padded returns the |i|'th word of |in|, if it is not out of
+// bounds. Otherwise, it returns 0. It does so without branches on the size of
+// |in|, however it necessarily does not have the same memory access pattern. If
+// the access would be out of bounds, it reads the last word of |in|. |in| must
+// not be zero.
+static BN_ULONG read_word_padded(const BIGNUM *in, size_t i) {
+ /* Read |in->d[i]| if valid. Otherwise, read the last word. */
+ // Read |in->d[i]| if valid. Otherwise, read the last word.
+ BN_ULONG l = in->d[constant_time_select_ulong(
+ constant_time_le_size_t(in->dmax, i), in->dmax - 1, i)];
+
+ /* Clamp to zero if above |d->top|. */
+ // Clamp to zero if above |d->top|.
+ return constant_time_select_ulong(constant_time_le_size_t(in->top, i), 0, l);
+}
+
+static int BN_bn2bin_padded(uint8_t *out, size_t len, const BIGNUM *in) {
+ size_t i;
+ BN_ULONG l;
+
+ /* Special case for |in| = 0. Just branch as the probability is negligible. */
+int BN_bn2bin_padded(uint8_t *out, size_t len, const BIGNUM *in) {
+ // Special case for |in| = 0. Just branch as the probability is negligible.
+ if (BN_is_zero(in)) {
+ memset(out, 0, len);
+ return 1;
+ }
+
+ /* Check if the integer is too big. This case can exit early in non-constant
+ * time. */
+ // Check if the integer is too big. This case can exit early in non-constant
+ // time.
+ if ((size_t)in->top > (len + (BN_BYTES - 1)) / BN_BYTES) {
+ return 0;
+ }
+ if ((len % BN_BYTES) != 0) {
+ l = read_word_padded(in, len / BN_BYTES);
+ BN_ULONG l = read_word_padded(in, len / BN_BYTES);
+ if (l >> (8 * (len % BN_BYTES)) != 0) {
+ return 0;
+ }
+ }
+
+ /* Write the bytes out one by one. Serialization is done without branching on
+ * the bits of |in| or on |in->top|, but if the routine would otherwise read
+ * out of bounds, the memory access pattern can't be fixed. However, for an
+ * RSA key of size a multiple of the word size, the probability of BN_BYTES
+ * leading zero octets is low.
+ *
+ * See Falko Stenzke, "Manger's Attack revisited", ICICS 2010. */
+ i = len;
+ // Write the bytes out one by one. Serialization is done without branching on
+ // the bits of |in| or on |in->top|, but if the routine would otherwise read
+ // out of bounds, the memory access pattern can't be fixed. However, for an
+ // RSA key of size a multiple of the word size, the probability of BN_BYTES
+ // leading zero octets is low.
+ //
+ // See Falko Stenzke, "Manger's Attack revisited", ICICS 2010.
+ size_t i = len;
+ while (i--) {
+ l = read_word_padded(in, i / BN_BYTES);
+ BN_ULONG l = read_word_padded(in, i / BN_BYTES);
+ *(out++) = (uint8_t)(l >> (8 * (i % BN_BYTES))) & 0xff;
+ }
+ return 1;
@ -77,3 +161,44 @@
static bool android_pubkey_encode_bignum(const BIGNUM* num, uint8_t* buffer) {
if (!BN_bn2bin_padded(buffer, ANDROID_PUBKEY_MODULUS_SIZE, num)) {
return false;
@@ -120,6 +237,7 @@ static bool android_pubkey_encode_bignum(const BIGNUM*
}
bool android_pubkey_encode(const RSA* key, uint8_t* key_buffer, size_t size) {
+ const BIGNUM *key_n, *key_e;
RSAPublicKey* key_struct = (RSAPublicKey*)key_buffer;
bool ret = false;
BN_CTX* ctx = BN_CTX_new();
@@ -136,27 +254,28 @@ bool android_pubkey_encode(const RSA* key, uint8_t* ke
key_struct->modulus_size_words = ANDROID_PUBKEY_MODULUS_SIZE_WORDS;
// Compute and store n0inv = -1 / N[0] mod 2^32.
+ RSA_get0_key(key, &key_n, &key_e, NULL);
if (!ctx || !r32 || !n0inv || !BN_set_bit(r32, 32) ||
- !BN_mod(n0inv, key->n, r32, ctx) ||
+ !BN_mod(n0inv, key_n, r32, ctx) ||
!BN_mod_inverse(n0inv, n0inv, r32, ctx) || !BN_sub(n0inv, r32, n0inv)) {
goto cleanup;
}
key_struct->n0inv = (uint32_t)BN_get_word(n0inv);
// Store the modulus.
- if (!android_pubkey_encode_bignum(key->n, key_struct->modulus)) {
+ if (!android_pubkey_encode_bignum(key_n, key_struct->modulus)) {
goto cleanup;
}
// Compute and store rr = (2^(rsa_size)) ^ 2 mod N.
if (!ctx || !rr || !BN_set_bit(rr, ANDROID_PUBKEY_MODULUS_SIZE * 8) ||
- !BN_mod_sqr(rr, rr, key->n, ctx) ||
+ !BN_mod_sqr(rr, rr, key_n, ctx) ||
!android_pubkey_encode_bignum(rr, key_struct->rr)) {
goto cleanup;
}
// Store the exponent.
- key_struct->exponent = (uint32_t)BN_get_word(key->e);
+ key_struct->exponent = (uint32_t)BN_get_word(key_e);
ret = true;

4
devel/efl/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= efl
DISTVERSION= 1.20.7
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel enlightenment
MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
DIST_SUBDIR= enlightenment
@ -94,7 +94,7 @@ WAYLAND_CFLAGS= -I${LOCALBASE}/include/libepoll-shim
WAYLAND_LDFLAGS= -lepoll-shim
WAYLAND_CONFIGURE_ENABLE= wayland
WAYLAND_EGL_LIB_DEPENDS= libwayland-egl.so:graphics/mesa-libs
WAYLAND_EGL_LIB_DEPENDS= libwayland-egl.so:graphics/wayland
WAYLAND_EGL_CONFIGURE_ENABLE= egl
WAYLANG_EGL_USE= GL=egl
WAYLAND_EGL_IMPLIES= WAYLAND OPENGLES

2
devel/libgit2/Makefile
View file

@ -3,7 +3,7 @@
# Also update devel/libgit2-glib, devel/rubygem-rugged, devel/py-pygit2
PORTNAME= libgit2
PORTVERSION= 0.27.4
PORTVERSION= 0.27.5
DISTVERSIONPREFIX= v
CATEGORIES= devel

6
devel/libgit2/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535127656
SHA256 (libgit2-libgit2-v0.27.4_GH0.tar.gz) = 0b7ca31cb959ff1b22afa0da8621782afe61f99242bf716c403802ffbdb21d51
SIZE (libgit2-libgit2-v0.27.4_GH0.tar.gz) = 4772254
TIMESTAMP = 1539602141
SHA256 (libgit2-libgit2-v0.27.5_GH0.tar.gz) = 15f2775f4f325951d9139ed906502b6c71fee6787cada9b045f5994072ccbd33
SIZE (libgit2-libgit2-v0.27.5_GH0.tar.gz) = 4775158

24
devel/libleaftag/Makefile
View file

@ -1,24 +0,0 @@
# Created by: Khairil Yusof <kaeru@inigo-tech.com>
# $FreeBSD$
PORTNAME= libleaftag
PORTVERSION= 0.3.1
PORTREVISION= 4
CATEGORIES= devel deskutils
MASTER_SITES= http://releases.chipx86.com/leaftag/libleaftag/
MAINTAINER= ports@FreeBSD.org
COMMENT= Leaftag is a library for tagging files on the desktop
DEPRECATED= Unmaintained upstream
EXPIRATION_DATE= 2018-10-15
USES= pathfix pkgconfig libtool sqlite:2
GNU_CONFIGURE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>

2
devel/libleaftag/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (libleaftag-0.3.1.tar.gz) = c2ef6cb3efa16543b5defd2c98f5044676eddba6be932707a996d81b2b3965fb
SIZE (libleaftag-0.3.1.tar.gz) = 363243

8
devel/libleaftag/pkg-descr
View file

@ -1,8 +0,0 @@
Leaftag is a library and set of utilities for tagging files on the desktop.
libleaftag is the core tagging library. It's GObject-based and provides a
simple means for tagging and untagging files, retrieving lists of tags, and
generally manipulating the database.
Project homepage:
WWW: http://www.chipx86.com/wiki/Leaftag

25
devel/libleaftag/pkg-plist
View file

@ -1,25 +0,0 @@
%%DOCSDIR%%/LtObject.html
%%DOCSDIR%%/LtSource.html
%%DOCSDIR%%/LtTag.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
%%DOCSDIR%%/libleaftag-db.html
%%DOCSDIR%%/libleaftag.devhelp
%%DOCSDIR%%/libleaftag.devhelp2
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
share/leaftag/leaftag-logo-small.png
include/libleaftag/db.h
include/libleaftag/leaftag.h
include/libleaftag/object.h
include/libleaftag/source.h
include/libleaftag/tag.h
lib/libleaftag.a
lib/libleaftag.so
lib/libleaftag.so.0
lib/libleaftag.so.0.0.1
libdata/pkgconfig/libleaftag.pc

3
devel/libversion/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libversion
PORTVERSION= 2.6.0
PORTREVISION= 1
PORTVERSION= 2.7.0
CATEGORIES= devel
MAINTAINER= amdmi3@FreeBSD.org

6
devel/libversion/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1522166749
SHA256 (repology-libversion-2.6.0_GH0.tar.gz) = a95fac4fdcf6ac45772fa8b66f8c3a469e53395ca78fba2f92f0575d7a7458d2
SIZE (repology-libversion-2.6.0_GH0.tar.gz) = 13665
TIMESTAMP = 1539639436
SHA256 (repology-libversion-2.7.0_GH0.tar.gz) = fce20444b65b700b760be7aecf775447b1dd7562186f7f6cd724a536b5078227
SIZE (repology-libversion-2.7.0_GH0.tar.gz) = 13832

2
devel/libversion/pkg-plist
View file

@ -3,5 +3,5 @@ include/libversion/version.h
lib/libversion.a
lib/libversion.so
lib/libversion.so.0
lib/libversion.so.0.0.0
lib/libversion.so.0.1.0
libdata/pkgconfig/libversion.pc

2
devel/nuitka/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nuitka
PORTVERSION= 0.6.0.2
PORTVERSION= 0.6.0.4
CATEGORIES= devel python
MASTER_SITES= https://nuitka.net/releases/
DISTNAME= Nuitka-${PORTVERSION}

6
devel/nuitka/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1539026725
SHA256 (Nuitka-0.6.0.2.tar.bz2) = 97518839d6c20ea287fb525f0c1756c30f39bcb821513786d6a10a5d5ac246e2
SIZE (Nuitka-0.6.0.2.tar.bz2) = 1509955
TIMESTAMP = 1539634957
SHA256 (Nuitka-0.6.0.4.tar.bz2) = 571541e3c7e1ad84daeb8787cf137f58218f55629e4b32d0971513b9d6d22ca1
SIZE (Nuitka-0.6.0.4.tar.bz2) = 1508753

10
devel/p5-Term-VT102-Boundless/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Term-VT102-Boundless
PORTVERSION= 0.04
PORTREVISION= 1
PORTVERSION= 0.05
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@ -11,14 +10,15 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Subclass to emulate boundless DEC VT102 terminal
LICENSE= ART10 GPLv1 MIT
LICENSE= ART10 GPLv1+ MIT
LICENSE_COMB= dual
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-Term-VT102>=0:devel/p5-Term-VT102
RUN_DEPENDS= p5-Term-VT102>=0.91:devel/p5-Term-VT102
NO_ARCH= yes
USES= perl5
USE_PERL5= configure
NO_ARCH= yes
.include <bsd.port.mk>

5
devel/p5-Term-VT102-Boundless/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (Term-VT102-Boundless-0.04.tar.gz) = 5bb88b5aecb44ebf56d3ac7240be80cd26def9dcf1ebeb4e77d9983dfc7a8f19
SIZE (Term-VT102-Boundless-0.04.tar.gz) = 2857
TIMESTAMP = 1539625228
SHA256 (Term-VT102-Boundless-0.05.tar.gz) = e1ded85ae3d76b59c03b8697f4a6cb01ae31bd62a9354f5bb7d18f9e927b485f
SIZE (Term-VT102-Boundless-0.05.tar.gz) = 3258

2
devel/py-certsrv/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= certsrv
PORTVERSION= 1.5.0
PORTVERSION= 2.0.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-certsrv/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1496687234
SHA256 (certsrv-1.5.0.tar.gz) = ee74865a3c5cbf19d5f5998c40fc70c618911b57392121ccca8644f602fa5517
SIZE (certsrv-1.5.0.tar.gz) = 2990
TIMESTAMP = 1539675761
SHA256 (certsrv-2.0.0.tar.gz) = 26d2e8252c4f213c8d602c9f184a3f690d59b42d37ebb22cf8f726ad40657766
SIZE (certsrv-2.0.0.tar.gz) = 5445

4
devel/py-inflect/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= inflect
PORTVERSION= 0.2.5
PORTVERSION= 1.0.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -12,6 +12,8 @@ COMMENT= Generate plurals, singular nouns, ordinals, indefinite articles
LICENSE= AGPLv3+
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils

5
devel/py-inflect/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (inflect-0.2.5.tar.gz) = 2014c8dcb2114ebae2941ba3f0fbd98a02c846792a7b72f2da31eb9aa431a818
SIZE (inflect-0.2.5.tar.gz) = 109756
TIMESTAMP = 1539676471
SHA256 (inflect-1.0.1.tar.gz) = ec42f5d5d2baa54ba6e3fa23698554c09362dd478cc66b3c28c5d0b76d7d0581
SIZE (inflect-1.0.1.tar.gz) = 110413

5
devel/py-nose2/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nose2
PORTVERSION= 0.7.4
PORTVERSION= 0.8.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -17,8 +17,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4.1:devel/py-coverage@${PY_FLAVO
py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR}
NO_ARCH= yes
USES= python
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>

6
devel/py-nose2/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1523551228
SHA256 (nose2-0.7.4.tar.gz) = 954a62cfb2d2ac06dad32995cbc822bf00cc11e20d543963515932fd4eff33fa
SIZE (nose2-0.7.4.tar.gz) = 141719
TIMESTAMP = 1539275660
SHA256 (nose2-0.8.0.tar.gz) = 9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3
SIZE (nose2-0.8.0.tar.gz) = 142142

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

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

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

@ -1,3 +1,3 @@
TIMESTAMP = 1539427004
SHA256 (rubygem/aws-sdk-core-2.11.147.gem) = c4594beb10b017a2aeb4d984f4dacc66cc86f3bc4dde0154e42892c4f746a53a
SIZE (rubygem/aws-sdk-core-2.11.147.gem) = 1362432
TIMESTAMP = 1539625093
SHA256 (rubygem/aws-sdk-core-2.11.148.gem) = 816a6c908430cba7fa62cabd3acd4b8e9b0a2704b23615e2e1d36a82d619ff49
SIZE (rubygem/aws-sdk-core-2.11.148.gem) = 1362944

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

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

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

@ -1,3 +1,3 @@
TIMESTAMP = 1539427021
SHA256 (rubygem/aws-sdk-resources-2.11.147.gem) = 7d883015f931114bf65fb0417eb1c33885ee3a39ef946eb2e0fe20aae0c7c54f
SIZE (rubygem/aws-sdk-resources-2.11.147.gem) = 48640
TIMESTAMP = 1539625114
SHA256 (rubygem/aws-sdk-resources-2.11.148.gem) = efba64d62aec33e7b71149738e1c6fae36a3f96dd2f4613113fd1d346a8b5a29
SIZE (rubygem/aws-sdk-resources-2.11.148.gem) = 48640

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

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

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

@ -1,3 +1,3 @@
TIMESTAMP = 1539427038
SHA256 (rubygem/aws-sdk-2.11.147.gem) = 7edb27656a6c1ab71d1e076f88a79280385c788099d0ef1a86d4fe5be6898308
SIZE (rubygem/aws-sdk-2.11.147.gem) = 4608
TIMESTAMP = 1539625134
SHA256 (rubygem/aws-sdk-2.11.148.gem) = 2fb3783b0408174c4e8dd03a2c2c015cf7cd0f6a68590f9d9ba4cb919939cacc
SIZE (rubygem/aws-sdk-2.11.148.gem) = 4608

2
devel/rubygem-rugged/Makefile
View file

@ -4,7 +4,7 @@
# Also update devel/libgit2, devel/libgit2-glib, devel/py-pygit2
PORTNAME= rugged
PORTVERSION= 0.27.4
PORTVERSION= 0.27.5
CATEGORIES= devel rubygems
MASTER_SITES= RG

6
devel/rubygem-rugged/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535127618
SHA256 (rubygem/rugged-0.27.4.gem) = e274316b4d5723a19a42510f16332d7323417f1feaae4515d981c1eab22fd3f8
SIZE (rubygem/rugged-0.27.4.gem) = 1156608
TIMESTAMP = 1539602085
SHA256 (rubygem/rugged-0.27.5.gem) = a6a3bf97a08e52a97f315287eb408902c5693f7399520a2144b7d30d13b764cb
SIZE (rubygem/rugged-0.27.5.gem) = 1157120

6
devel/rubygem-tty-editor/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= tty-editor
PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@ -15,8 +16,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= rubygem-tty-prompt>=0.17.0:devel/rubygem-tty-prompt \
rubygem-tty-which>=0.3.0:devel/rubygem-tty-which
NO_ARCH= yes
USE_RUBY= yes
USES= gem
USE_RUBY= yes
NO_ARCH= yes
.include <bsd.port.mk>

11
devel/rubygem-tty-editor/files/patch-gemspec Normal file
View file

@ -0,0 +1,11 @@
--- tty-editor.gemspec.orig 2018-10-15 19:01:26 UTC
+++ tty-editor.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<tty-prompt>.freeze, ["~> 0.17.0"])
- s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3.0"])
+ s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3"])
s.add_development_dependency(%q<bundler>.freeze, ["< 2.0", ">= 1.5.0"])
s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])

6
devel/rubygem-tty-pager/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= tty-pager
PORTVERSION= 0.11.0
PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@ -16,8 +17,9 @@ RUN_DEPENDS= rubygem-strings>=0.1.0:devel/rubygem-strings \
rubygem-tty-screen>=0.6.4:devel/rubygem-tty-screen \
rubygem-tty-which>=0.3.0:devel/rubygem-tty-which
NO_ARCH= yes
USE_RUBY= yes
USES= gem
USE_RUBY= yes
NO_ARCH= yes
.include <bsd.port.mk>

11
devel/rubygem-tty-pager/files/patch-gemspec Normal file
View file

@ -0,0 +1,11 @@
--- tty-pager.gemspec.orig 2018-10-15 19:04:10 UTC
+++ tty-pager.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<tty-screen>.freeze, ["~> 0.6.4"])
- s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3.0"])
+ s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3"])
s.add_runtime_dependency(%q<strings>.freeze, ["~> 0.1.0"])
s.add_development_dependency(%q<bundler>.freeze, ["< 2.0", ">= 1.5.0"])
s.add_development_dependency(%q<rake>.freeze, [">= 0"])

7
devel/rubygem-tty-which/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tty-which
PORTVERSION= 0.3.0
PORTVERSION= 0.4.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
@ -12,8 +12,9 @@ COMMENT= Platform independent implementation of Unix which command
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
USES= gem
USE_RUBY= yes
NO_ARCH= yes
.include <bsd.port.mk>

6
devel/rubygem-tty-which/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1520792558
SHA256 (rubygem/tty-which-0.3.0.gem) = 6fb567d72e68986fc275a47b3fa4ca43fde5d0bcc336393175b65bb3015568a8
SIZE (rubygem/tty-which-0.3.0.gem) = 11264
TIMESTAMP = 1539625152
SHA256 (rubygem/tty-which-0.4.0.gem) = 2f38d222bc48872bc89644c1694cabad49a97c94b7765de8c637498246cc7c35
SIZE (rubygem/tty-which-0.4.0.gem) = 10752

7
devel/rubygem-tty/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= tty
PORTVERSION= 0.8.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel rubygems
MASTER_SITES= RG
@ -35,9 +35,10 @@ RUN_DEPENDS= rubygem-bundler>=1.16:sysutils/rubygem-bundler \
rubygem-tty-tree>=0.1.0:devel/rubygem-tty-tree \
rubygem-tty-which>=0.3.0:devel/rubygem-tty-which
NO_ARCH= yes
USE_RUBY= yes
USES= gem
USE_RUBY= yes
NO_ARCH= yes
PLIST_FILES= bin/teletype

8
devel/rubygem-tty/files/patch-gemspec
View file

@ -1,6 +1,6 @@
--- tty.gemspec.orig 2018-09-03 15:28:01 UTC
--- tty.gemspec.orig 2018-10-15 18:57:50 UTC
+++ tty.gemspec
@@ -27,19 +27,19 @@ Gem::Specification.new do |s|
@@ -27,20 +27,20 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<tty-color>.freeze, ["~> 0.4.2"])
s.add_runtime_dependency(%q<tty-command>.freeze, ["~> 0.8.0"])
s.add_runtime_dependency(%q<tty-config>.freeze, ["~> 0.2.0"])
@ -20,7 +20,9 @@
s.add_runtime_dependency(%q<tty-spinner>.freeze, ["~> 0.8.0"])
s.add_runtime_dependency(%q<tty-table>.freeze, ["~> 0.10.0"])
- s.add_runtime_dependency(%q<tty-tree>.freeze, ["~> 0.1.0"])
- s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3.0"])
+ s.add_runtime_dependency(%q<tty-tree>.freeze, ["~> 0.1"])
s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3.0"])
+ s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3"])
s.add_runtime_dependency(%q<equatable>.freeze, ["~> 0.5.0"])
s.add_runtime_dependency(%q<pastel>.freeze, ["~> 0.7.2"])
s.add_runtime_dependency(%q<thor>.freeze, ["~> 0.20.0"])

6
dns/bind9-devel/Makefile
View file

@ -9,7 +9,7 @@ PORTREVISION= 0
.else
# XXX: correct version
# dns/bind9xx here
PORTREVISION= 1
PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
# XXX: put the ISC master_site
@ -40,13 +40,13 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
# XXX: remove tar:bz2
USES= cpe libedit ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.13.1a0.2018.10.05
ISCVERSION= 9.13.1a0.2018.10.12
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= e8f66bcfa36b89586319372a7fe626fbf4e49a03
GL_COMMIT= 60f22ff410e3f2139240ed845305160a6f05808d
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

6
dns/bind9-devel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1538992970
SHA256 (isc-projects-bind9-e8f66bcfa36b89586319372a7fe626fbf4e49a03_GL0.tar.gz) = 391ce0d8cdc9d714a8fc2339ea914e0ad8a6ba85cc0f60cc1beeda86edb3e145
SIZE (isc-projects-bind9-e8f66bcfa36b89586319372a7fe626fbf4e49a03_GL0.tar.gz) = 7274863
TIMESTAMP = 1539621587
SHA256 (isc-projects-bind9-60f22ff410e3f2139240ed845305160a6f05808d_GL0.tar.gz) = 2600b29f2949a773745df83c4010145b4cc7f37fd2748009f63e60ab18179347
SIZE (isc-projects-bind9-60f22ff410e3f2139240ed845305160a6f05808d_GL0.tar.gz) = 7274641

2
editors/ghostwriter/Makefile
View file

@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= desktop-file-utils pkgconfig qmake qt:5
USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= wereturtle
USE_QT= concurrent core gui network printsupport svg webkit widgets \

31
editors/openoffice-4/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@ -96,6 +96,21 @@ RUN_DEPENDS= \
${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
USES= autoreconf bison compiler:c++11-lib cpe \
desktop-file-utils \
gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \
shared-mime-info ssl tar:bzip2
USE_GL= gl glu
USE_GNOME= gtk20 libxslt libidl glib20
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_RUN= jdk
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
USE_PERL5= build
USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
xinerama xrandr xrender xt
CONFLICTS_INSTALL= apache-openoffice-devel-*
AOOVERSION1= 4
@ -119,20 +134,6 @@ XDGDIR= ${OOPATH}/share/xdg
XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
EXECBASE?= openoffice-${AOOSUFFIX}
USES= autoreconf bison compiler:c++11-lib cpe \
desktop-file-utils \
gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \
shared-mime-info ssl tar:bzip2
USE_GL= gl glu
USE_GNOME= gtk20 libxslt libidl glib20
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_RUN= jdk
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
USE_PERL5= build
USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
xinerama xrandr xrender xt
INSTALLS_ICONS= yes
WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}

95
editors/openoffice-4/files/patch-oox_source_core_filterdetect.cxx Normal file
View file

@ -0,0 +1,95 @@
--- oox/source/core/filterdetect.cxx.orig 2017-11-27 13:44:08 UTC
+++ oox/source/core/filterdetect.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/io/XStream.hpp>
#include <comphelper/docpasswordhelper.hxx>
#include <comphelper/mediadescriptor.hxx>
+#include <openssl/opensslv.h>
#include <openssl/evp.h>
#include <rtl/digest.h>
#include "oox/core/fastparser.hxx"
@@ -355,25 +356,39 @@ bool lclCheckEncryptionData( const sal_uInt8* pnKey, s
if ( nKeySize == 16 && nVerifierSize == 16 && nVerifierHashSize == 32 )
{
// check password
+ EVP_CIPHER_CTX *pAes_ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX aes_ctx;
EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+ pAes_ctx = &aes_ctx;
+#else
+ pAes_ctx = EVP_CIPHER_CTX_new();
+#endif
+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 );
int nOutLen = 0;
sal_uInt8 pnTmpVerifier[ 16 ];
(void) memset( pnTmpVerifier, 0, sizeof(pnTmpVerifier) );
- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize );
+ /*int*/ EVP_DecryptUpdate( pAes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize );
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX_cleanup( &aes_ctx );
EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+#else
+ EVP_CIPHER_CTX_reset( pAes_ctx );
+#endif
+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 );
sal_uInt8 pnTmpVerifierHash[ 32 ];
(void) memset( pnTmpVerifierHash, 0, sizeof(pnTmpVerifierHash) );
- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize );
+ /*int*/ EVP_DecryptUpdate( pAes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize );
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX_cleanup( &aes_ctx );
+#else
+ EVP_CIPHER_CTX_free( pAes_ctx );
+#endif
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
rtlDigestError aError = rtl_digest_update( aDigest, pnTmpVerifier, sizeof( pnTmpVerifier ) );
@@ -562,10 +577,16 @@ Reference< XInputStream > FilterDetect::extractUnencry
BinaryXOutputStream aDecryptedPackage( xDecryptedPackage, true );
BinaryXInputStream aEncryptedPackage( xEncryptedPackage, true );
+ EVP_CIPHER_CTX *pAes_ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX aes_ctx;
EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+ pAes_ctx = &aes_ctx;
+#else
+ pAes_ctx = EVP_CIPHER_CTX_new();
+#endif
+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 );
sal_uInt8 pnInBuffer[ 1024 ];
sal_uInt8 pnOutBuffer[ 1024 ];
@@ -574,13 +595,17 @@ Reference< XInputStream > FilterDetect::extractUnencry
aEncryptedPackage.skip( 8 ); // decrypted size
while( (nInLen = aEncryptedPackage.readMemory( pnInBuffer, sizeof( pnInBuffer ) )) > 0 )
{
- EVP_DecryptUpdate( &aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
+ EVP_DecryptUpdate( pAes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
}
- EVP_DecryptFinal_ex( &aes_ctx, pnOutBuffer, &nOutLen );
+ EVP_DecryptFinal_ex( pAes_ctx, pnOutBuffer, &nOutLen );
aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX_cleanup( &aes_ctx );
+#else
+ EVP_CIPHER_CTX_free( pAes_ctx );
+#endif
xDecryptedPackage->flush();
aDecryptedPackage.seekToStart();

31
editors/openoffice-devel/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@ -98,6 +98,21 @@ RUN_DEPENDS= \
${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
USES= autoreconf bison compiler:c++11-lib cpe \
desktop-file-utils \
gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \
shared-mime-info ssl tar:${TARTYPE}
USE_GL= gl glu
USE_GNOME= gtk20 libxslt libidl glib20
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_RUN= jdk
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
USE_PERL5= build
USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
xinerama xrandr xrender xt
CONFLICTS_INSTALL= apache-openoffice-4*
AOOVERSION1= 4
@ -131,20 +146,6 @@ XDGDIR= ${OOPATH}/share/xdg
XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
EXECBASE?= openoffice-${AOOSUFFIX}
USES= autoreconf bison compiler:c++11-lib cpe \
desktop-file-utils \
gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \
shared-mime-info ssl tar:${TARTYPE}
USE_GL= gl glu
USE_GNOME= gtk20 libxslt libidl glib20
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_RUN= jdk
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
USE_PERL5= build
USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
xinerama xrandr xrender xt
INSTALLS_ICONS= yes
WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}

95
editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx Normal file
View file

@ -0,0 +1,95 @@
--- oox/source/core/filterdetect.cxx.orig 2018-04-13 00:54:08 UTC
+++ oox/source/core/filterdetect.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/io/XStream.hpp>
#include <comphelper/docpasswordhelper.hxx>
#include <comphelper/mediadescriptor.hxx>
+#include <openssl/opensslv.h>
#include <openssl/evp.h>
#include <rtl/digest.h>
#include "oox/core/fastparser.hxx"
@@ -355,25 +356,39 @@ bool lclCheckEncryptionData( const sal_uInt8* pnKey, s
if ( nKeySize == 16 && nVerifierSize == 16 && nVerifierHashSize == 32 )
{
// check password
+ EVP_CIPHER_CTX *pAes_ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX aes_ctx;
EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+ pAes_ctx = &aes_ctx;
+#else
+ pAes_ctx = EVP_CIPHER_CTX_new();
+#endif
+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 );
int nOutLen = 0;
sal_uInt8 pnTmpVerifier[ 16 ];
(void) memset( pnTmpVerifier, 0, sizeof(pnTmpVerifier) );
- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize );
+ /*int*/ EVP_DecryptUpdate( pAes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize );
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX_cleanup( &aes_ctx );
EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+#else
+ EVP_CIPHER_CTX_reset( pAes_ctx );
+#endif
+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 );
sal_uInt8 pnTmpVerifierHash[ 32 ];
(void) memset( pnTmpVerifierHash, 0, sizeof(pnTmpVerifierHash) );
- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize );
+ /*int*/ EVP_DecryptUpdate( pAes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize );
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX_cleanup( &aes_ctx );
+#else
+ EVP_CIPHER_CTX_free( pAes_ctx );
+#endif
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
rtlDigestError aError = rtl_digest_update( aDigest, pnTmpVerifier, sizeof( pnTmpVerifier ) );
@@ -562,10 +577,16 @@ Reference< XInputStream > FilterDetect::extractUnencry
BinaryXOutputStream aDecryptedPackage( xDecryptedPackage, true );
BinaryXInputStream aEncryptedPackage( xEncryptedPackage, true );
+ EVP_CIPHER_CTX *pAes_ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX aes_ctx;
EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+ pAes_ctx = &aes_ctx;
+#else
+ pAes_ctx = EVP_CIPHER_CTX_new();
+#endif
+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 );
sal_uInt8 pnInBuffer[ 1024 ];
sal_uInt8 pnOutBuffer[ 1024 ];
@@ -574,13 +595,17 @@ Reference< XInputStream > FilterDetect::extractUnencry
aEncryptedPackage.skip( 8 ); // decrypted size
while( (nInLen = aEncryptedPackage.readMemory( pnInBuffer, sizeof( pnInBuffer ) )) > 0 )
{
- EVP_DecryptUpdate( &aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
+ EVP_DecryptUpdate( pAes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
}
- EVP_DecryptFinal_ex( &aes_ctx, pnOutBuffer, &nOutLen );
+ EVP_DecryptFinal_ex( pAes_ctx, pnOutBuffer, &nOutLen );
aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_CIPHER_CTX_cleanup( &aes_ctx );
+#else
+ EVP_CIPHER_CTX_free( pAes_ctx );
+#endif
xDecryptedPackage->flush();
aDecryptedPackage.seekToStart();

111
editors/texworks/Makefile
View file

@ -2,101 +2,52 @@
# $FreeBSD$
PORTNAME= texworks
PORTVERSION= 0.4.6
DISTVERSIONPREFIX= release-
PORTREVISION= 7
DISTVERSION= 0.6.2
CATEGORIES= editors
MAINTAINER= hrs@FreeBSD.org
COMMENT= Simple TeX front-end program
LICENSE= GPLv2
BROKEN_armv6= fails to install: PDFDocument.cpp:1836:39: cannot initialize a parameter of type 'qreal *' with an rvalue of type 'double *'
BROKEN_armv7= fails to install: PDFDocument.cpp:1836:39: cannot initialize a parameter of type 'qreal *' with an rvalue of type 'double *'
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= hunspell:textproc/hunspell
LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \
libpoppler.so:graphics/poppler \
libpoppler-qt5.so:graphics/poppler-qt5
USES= compiler:c++11-lang pkgconfig qmake qt:4
USES= cmake:outsource desktop-file-utils pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= TeXworks
USE_QT= gui corelib rcc_build moc_build uic_build \
dbus xml scripttools designer_build
QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} \
DATA_DIR=${DATADIR} \
DOCS_DIR=${DOCSDIR} \
ICON_DIR=${PREFIX}/share/pixmaps \
DESKTOP_DIR=${PREFIX}/share/applications \
MAN_DIR=${PREFIX}/man/man1 \
TW_DICPATH=${LOCALBASE}/share/hunspell \
TW_HELPPATH=${DOCSDIR} \
TW_PLUGINPATH=${PREFIX}/lib/texworks
USE_TEX= synctex
USE_QT= buildtools_build designer_build qmake_build \
core concurrent dbus gui linguisttools script \
scripttools uitools widgets xml
DESKTOP_ENTRIES="TexWorks" \
"Lowering the entry barrier to the TeX world" \
"TeXworks" \
"${PORTNAME}" \
"Utility;Qt;" \
true
USE_TEX= synctex
USE_LDCONFIG= yes
CMAKE_ARGS= -DTeXworks_DIC_DIR:PATH=${LOCALBASE}/share/hunspell \
-DTeXworks_DOCS_DIR:PATH=${DOCSDIR_REL} \
-DTeXworks_HELP_DIR:PATH=${DOCSDIR_REL} \
-DTeXworks_MAN_DIR:PATH=man/man1
OPTIONS_DEFINE= DOCS LUA PYTHON
LUA_USES= lua
LUA_CMAKE_BOOL= WITH_LUA
LUA_PLIST_FILES= lib/texworks/libTWLuaPlugin.so
PYTHON_USES= python:3.4+
PYTHON_CMAKE_BOOL= WITH_PYTHON
PYTHON_PLIST_FILES= lib/texworks/libTWPythonPlugin.so
PORTDOCS= *
PLIST_FILES= bin/texworks \
man/man1/texworks.1.gz \
share/appdata/texworks.appdata.xml \
share/applications/texworks.desktop \
share/pixmaps/TeXworks.png
PLIST_DIRS= lib/texworks
PORTDOCS= *
OPTIONS_DEFINE= DOCS LUA PYTHON
LUA_USES= lua:51
LUA_PLIST_FILES=lib/texworks/libTWLuaPlugin.so
PYTHON_USES= python:3.4+
PYTHON_PLIST_FILES=lib/texworks/libTWPythonPlugin.so
post-extract:
cd ${WRKSRC} && ${INSTALL_DATA} GitArchiveInfo.txt src/GitRev.h
post-patch:
@${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,' \
${WRKSRC}/src/TWUtils.cpp
@${REINPLACE_CMD} -e 's,lua5.1,lua-5.1,' \
${WRKSRC}/plugins-src/TWLuaPlugin/TWLuaPlugin.pro
@${REINPLACE_CMD} -e '53,54s,^,#,' \
-e '57,59s,#,,' \
-e 's,python3,python-${PYTHON_VER},' \
${WRKSRC}/plugins-src/TWPythonPlugin/TWPythonPlugin.pro
post-patch-DOCS-off:
@${REINPLACE_CMD} -e '/INSTALLS/s,documentation manual ,,' \
${WRKSRC}/TeXworks.pro
post-configure-LUA-on:
cd ${WRKSRC}/plugins-src/TWLuaPlugin && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} ${QMAKE_ARGS}
post-configure-PYTHON-on:
cd ${WRKSRC}/plugins-src/TWPythonPlugin && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} ${QMAKE_ARGS}
post-build-LUA-on:
cd ${WRKSRC}/plugins-src/TWLuaPlugin && ${MAKE}
post-build-PYTHON-on:
cd ${WRKSRC}/plugins-src/TWPythonPlugin && ${MAKE}
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/texworks
post-install-LUA-on:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/texworks
cd ${WRKSRC}/plugins-src/TWLuaPlugin && \
${INSTALL_DATA} libTWLuaPlugin.so \
${STAGEDIR}${PREFIX}/lib/texworks
post-install-PYTHON-on:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/texworks
cd ${WRKSRC}/plugins-src/TWPythonPlugin && \
${INSTALL_DATA} libTWPythonPlugin.so \
${STAGEDIR}${PREFIX}/lib/texworks
.include <bsd.port.mk>

5
editors/texworks/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (TeXworks-texworks-release-0.4.6_GH0.tar.gz) = 58650574c1e3234c38cddc3375f8043a83cc65075839030fc7089471af6a3bde
SIZE (TeXworks-texworks-release-0.4.6_GH0.tar.gz) = 11271881
TIMESTAMP = 1536894823
SHA256 (TeXworks-texworks-release-0.6.2_GH0.tar.gz) = 22885c11d92654b0cba1f4808fc9aa3c2fdd3e5435fd89dff9aa1e67658a6339
SIZE (TeXworks-texworks-release-0.6.2_GH0.tar.gz) = 11508277

44
editors/texworks/files/patch-TeXworks.pro
View file

@ -1,44 +0,0 @@
--- TeXworks.pro.orig 2015-04-03 18:05:39 UTC
+++ TeXworks.pro
@@ -108,7 +108,7 @@ unix:!macx { # on Unix-ish platforms we
CONFIG += link_pkgconfig
PKGCONFIG += hunspell
PKGCONFIG += poppler-qt4
- PKGCONFIG += zlib
+ PKGCONFIG += synctex zlib
# Enclose the path in \\\" (which later gets expanded to \", which in turn
# gets expanded to " in the c++ code)
@@ -180,8 +181,7 @@ HEADERS += src/TWApp.h \
src/TWVersion.h \
src/TWTextCodecs.h \
src/SvnRev.h \
- src/synctex_parser.h \
- src/synctex_parser_utils.h \
+ src/TWSynchronizer.h \
src/ClickableLabel.h \
src/ConfigurableApp.h \
src/TWSystemCmd.h
@@ -225,8 +225,7 @@ SOURCES += src/main.cpp \
src/ResourcesDialog.cpp \
src/ScriptManager.cpp \
src/ConfirmDelete.cpp \
- src/synctex_parser.c \
- src/synctex_parser_utils.c
+ src/TWSynchronizer.cpp
RESOURCES += res/resources.qrc \
res/resfiles.qrc
@@ -259,10 +258,10 @@ unix:!macx { # installation on Unix-ish
isEmpty(DESKTOP_DIR):DESKTOP_DIR = $$DATA_DIR/applications
target.path = $$BIN_DIR
- documentation.files = COPYING README NEWS
+ documentation.files = README NEWS
documentation.path = $$DOCS_DIR
manual.files = manual/*
- manual.path = $$TW_HELPPATH
+ manual.path = DOCS_DIR
icon.files = res/images/TeXworks.png
icon.path = $$ICON_DIR
man.files = man/texworks.1

6
emulators/citra/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= citra
PORTVERSION= s20181011
PORTVERSION= s20181015
PORTREVISION?= 0
CATEGORIES= emulators
@ -23,12 +23,12 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs
USE_GITHUB= yes
GH_ACCOUNT= citra-emu
GH_TAGNAME= 0962ab8da
GH_TAGNAME= b01b94d84
GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \
arsenm:sanitizers-cmake:f09151b:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
benhoyt:inih:r40:inih/externals/inih/inih \
benhoyt:inih:r42-6-g2023872:inih/externals/inih/inih \
catchorg:Catch2:v2.3.0:catch/externals/catch \
fmtlib:fmt:5.2.1:fmt/externals/fmt \
herumi:xbyak:v5.71:xbyak/externals/xbyak \

10
emulators/citra/distinfo
View file

@ -1,6 +1,6 @@
TIMESTAMP = 1539277442
SHA256 (citra-emu-citra-s20181011-0962ab8da_GH0.tar.gz) = c407d6bdeb893afe88de074167081b4136734aa4b3a7ee2dcbe786d46e395f25
SIZE (citra-emu-citra-s20181011-0962ab8da_GH0.tar.gz) = 4493596
TIMESTAMP = 1539617195
SHA256 (citra-emu-citra-s20181015-b01b94d84_GH0.tar.gz) = 2c3770ff036e8b0b6a2de50ab7233026268ea69e6ad3999f222ec661d18d338c
SIZE (citra-emu-citra-s20181015-b01b94d84_GH0.tar.gz) = 4494289
SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942
SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c
@ -9,8 +9,8 @@ SHA256 (MerryMage-dynarmic-r1-992-g4e6848d1_GH0.tar.gz) = 1dd65997fce183976de089
SIZE (MerryMage-dynarmic-r1-992-g4e6848d1_GH0.tar.gz) = 1446282
SHA256 (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 40d826a6c98fdedf1097bdb96944b2905be507ed5d11e74480680d459fc22431
SIZE (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 6856
SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340
SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436
SHA256 (benhoyt-inih-r42-6-g2023872_GH0.tar.gz) = 7ea50578066fbcff2c33a303850eb165f0aeb4dc0af1dcf0e068b3ad6acc7fea
SIZE (benhoyt-inih-r42-6-g2023872_GH0.tar.gz) = 12913
SHA256 (catchorg-Catch2-v2.3.0_GH0.tar.gz) = aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f
SIZE (catchorg-Catch2-v2.3.0_GH0.tar.gz) = 506374
SHA256 (fmtlib-fmt-5.2.1_GH0.tar.gz) = 3c812a18e9f72a88631ab4732a97ce9ef5bcbefb3235e9fd465f059ba204359b

4
emulators/ppsspp/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= ppsspp
DISTVERSIONPREFIX= v
DISTVERSION?= 1.6.3
PORTREVISION?= 3
PORTREVISION?= 4
CATEGORIES= emulators
# XXX Get from Debian once #697821 lands
MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
@ -73,7 +73,7 @@ SDL_BUILD_DEPENDS= png>=1.6:graphics/png
SDL_LIB_DEPENDS= libpng.so:graphics/png
SDL_VARS= EXENAME=PPSSPPSDL
VULKAN_DESC= Vulkan renderer
VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
post-patch:
@${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' \

4
emulators/rpcs3/Makefile
View file

@ -2,8 +2,8 @@
PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.5-975
DISTVERSIONSUFFIX= -g8540399ec
DISTVERSION= 0.0.5-979
DISTVERSIONSUFFIX= -g4ab777b42
CATEGORIES= emulators
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

6
emulators/rpcs3/distinfo
View file

@ -1,6 +1,6 @@
TIMESTAMP = 1539369014
SHA256 (RPCS3-rpcs3-v0.0.5-975-g8540399ec_GH0.tar.gz) = 915d23dfd88625c72d975be271222a4d84012fafe14debebf436f997039233cf
SIZE (RPCS3-rpcs3-v0.0.5-975-g8540399ec_GH0.tar.gz) = 5013094
TIMESTAMP = 1539548086
SHA256 (RPCS3-rpcs3-v0.0.5-979-g4ab777b42_GH0.tar.gz) = a29a34134ee2f95a6ff3b44d78b8d46ec6211077b7d7ac65cb43675c97068ee9
SIZE (RPCS3-rpcs3-v0.0.5-979-g4ab777b42_GH0.tar.gz) = 5013429
SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 4f58ba2a51136cc6af0f1d833688b55f78468c4f5429a4bf9b38bb51c9d212b1
SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 105372
SHA256 (RPCS3-llvm-5c906fd1694e_GH0.tar.gz) = 8bbe95fbbea545ebb03e73d526add64e2853f86176ad42690f8ce5846bd419ce

11
emulators/wine-devel/Makefile
View file

@ -55,12 +55,14 @@ SUB_FILES= pkg-message
PORTDATA= l_intl.nls wine.inf
OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D WINEMAKER X11 GECKO MONO
OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
OPTIONS_DEFAULT=GNUTLS X11
OPTIONS_SUB= yes
DOSBOX_DESC= Use DOSBox to run MS-DOS programs
LIBXSLT_DESC= Use libxslt (only used by msxml3.dll)
VKD3D_DESC= Direct3D 12 support via Vulkan
VULKAN_DESC= Vulkan API support
WINEMAKER_DESC= Fully support winemaker (requires Perl)
GECKO_DESC= Bundle Gecko MSI package for Wine
MONO_DESC= Bundle Mono MSI package for Wine
@ -96,7 +98,12 @@ V4L_CONFIGURE_WITH= v4l
V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
V4L_LIB_DEPENDS= libv4l1.so:multimedia/libv4l
VKD3D_IGNORE= The VKD3D option is not supported (yet)
VKD3D_CONFIGURE_WITH= vkd3d
VKD3D_USES= pkgconfig
VKD3D_LIB_DEPENDS= libvkd3d.so:graphics/vkd3d
VULKAN_CONFIGURE_WITH= vulkan
VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML

2
finance/alkimia/Makefile
View file

@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB
# Depending on ecm via USE_KDE causes unwanted CMAKE_ARGS to be set
BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules
USES= cmake:outsource pathfix tar:xz
USES= cmake:outsource compiler:c++11-lang pathfix tar:xz
USE_LDCONFIG= yes
SLAVE?= qt5

8
games/bloboats/Makefile
View file

@ -4,17 +4,21 @@
PORTNAME= bloboats
PORTVERSION= 1.0.2
DISTVERSIONSUFFIX= -source
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://bloboats.dy.fi/mirror/ \
LOCAL/ehaupt
MAINTAINER= ehaupt@FreeBSD.org
MAINTAINER= ports@FreeBSD.org
COMMENT= Boat racing game in the spirit of Elasto Mania or X-Moto
DEPRECATED= Upstream gone
EXPIRATION_DATE= 2018-11-15
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/copying.txt
BROKEN_FreeBSD_11= does not build on 11.X
BROKEN_FreeBSD_12= does not build on 12.X # PR 226180
USES= dos2unix gmake

2
games/bloboats/pkg-descr
View file

@ -1,4 +1,2 @@
Bloboats is a boat racing game in the spirit of Elasto Mania or X-Moto. It
introduces a handful of elements from Super Mario Bros-like games.
WWW: http://bloboats.dy.fi/about.php

14
games/nxengine/Makefile
View file

@ -2,8 +2,8 @@
PORTNAME= nxengine
PORTVERSION= 2.6.3
PORTREVISION= 1
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES+= https://www.cavestory.org/downloads/:data \
SF/lifanov-ports-distfiles/games/${PORTNAME}/:icons
@ -23,22 +23,20 @@ LICENSE_PERMS_FREEWARE= dist-mirror pkg-mirror auto-accept
LICENSE_DISTFILES_GPLv3= ${DISTFILES:[3]}
LICENSE_DISTFILES_FREEWARE= ${DISTFILES:[2]:S/:data//}
BROKEN_aarch64= fails to compile: player.cpp:763:50: constant expression evaluates to -1 which cannot be narrowed to type 'char' [-Wc++11-narrowing]
BROKEN_armv6= fails to compile: player.cpp:763:50: constant expression evaluates to -1 which cannot be narrowed to type 'char' [-Wc++11-narrowing]
BROKEN_armv7= fails to compile: player.cpp:763:50: constant expression evaluates to -1 which cannot be narrowed to type 'char' [-Wc++11-narrowing]
LIB_DEPENDS= libpng.so:graphics/png
DESKTOP_ENTRIES="NXEngine" "" "${PORTNAME}" \
"${PORTNAME}" "Game;AdventureGame;" ""
USES= cmake:outsource compiler:c++11-lang
USE_SDL= mixer2 sdl2
SUB_FILES= ${PORTNAME}
CXXFLAGS+= -Wno-error-narrowing
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME}-evo
DESKTOP_ENTRIES="NXEngine" "" "${PORTNAME}" \
"${PORTNAME}" "Game;AdventureGame;" ""
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_PROGRAM} ${WRKSRC}/bin/nx ${STAGEDIR}${DATADIR}

2
games/wtf/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= wtf
PORTVERSION= 20180919
PORTVERSION= 20180925
CATEGORIES= games
MASTER_SITES= SF/bsdwtf

6
games/wtf/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537757833
SHA256 (wtf-20180919.tar.gz) = e9787feaff2b31fe67370e0b42c6a36c3895eb730575f82c0f41392422edac58
SIZE (wtf-20180919.tar.gz) = 27136
TIMESTAMP = 1539562994
SHA256 (wtf-20180925.tar.gz) = 87c695c166de5d47bd41661fbd3487e313bee5811a7d5697e05d35fcd2af9eac
SIZE (wtf-20180925.tar.gz) = 27152

2
german/mythes/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mythes
PORTVERSION= 2018.10.07
PORTVERSION= 2018.10.14
CATEGORIES= german textproc
MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/
DISTNAME= Deutscher-Thesaurus-${PORTVERSION:C/\.//g}

6
german/mythes/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1539011702
SHA256 (mythes/Deutscher-Thesaurus-20181007.oxt) = fad8381c659110729d466e60823454dffb2b724c6b5563a61f7ea7cb6553404a
SIZE (mythes/Deutscher-Thesaurus-20181007.oxt) = 9017783
TIMESTAMP = 1539616463
SHA256 (mythes/Deutscher-Thesaurus-20181014.oxt) = a4d423492448019816b5f1c18638e5f1b36bc7e22555cd32eae2d6899ff1a508
SIZE (mythes/Deutscher-Thesaurus-20181014.oxt) = 9083177

1
graphics/Makefile
View file

@ -1123,6 +1123,7 @@
SUBDIR += vigra
SUBDIR += vips
SUBDIR += visprint
SUBDIR += vkd3d
SUBDIR += volpack
SUBDIR += vp
SUBDIR += vulkan-loader

5
graphics/glfw/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= glfw
PORTVERSION= 3.2.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF
@ -26,8 +26,7 @@ OPTIONS_EXCLUDE_FreeBSD_10= WAYLAND # needs dev/evdev/input.h
WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
WAYLAND_CMAKE_BOOL= GLFW_USE_WAYLAND
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libwayland-egl.so:graphics/mesa-libs \
WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \
libxkbcommon.so:x11/libxkbcommon
WAYLAND_USES= kde:5 pkgconfig
WAYLAND_USE= KDE=ecm

2
graphics/krita/pkg-plist
View file

@ -890,9 +890,7 @@ share/kritaplugins/rotateimage.xmlgui
share/kritaplugins/shearimage.xmlgui
share/kritaplugins/waveletdecompose.xmlgui
share/locale/af/LC_MESSAGES/krita.mo
share/locale/ast/LC_MESSAGES/krita.mo
share/locale/ar/LC_MESSAGES/krita.mo
share/locale/ast/LC_MESSAGES/krita.mo
share/locale/be/LC_MESSAGES/krita.mo
share/locale/bg/LC_MESSAGES/krita.mo
share/locale/br/LC_MESSAGES/krita.mo

15
graphics/mesa-dri/Makefile
View file

@ -3,13 +3,14 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
PORTREVISION= 1
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
USE_XORG= xorgproto x11 xdamage xext xfixes xshmfence xv xvmc
OPTIONS_DEFINE= TEXTURE VAAPI VDPAU
OPTIONS_DEFINE= TEXTURE VAAPI VDPAU WAYLAND
OPTIONS_DEFAULT=TEXTURE
OPTIONS_SUB= yes
@ -23,6 +24,10 @@ VAAPI_USE= XORG=xcb
VDPAU_CONFIGURE_ENABLE= vdpau
VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
WAYLAND_DESC= Enable support for the Wayland platform in Vulkan drivers
WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
.include <bsd.port.options.mk>
.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
@ -74,6 +79,14 @@ LDFLAGS+= -B${LOCALBASE}/bin
. endif
.endif
# enables VK_KHR_wayland_surface in Vulkan drivers
.if ${PORT_OPTIONS:MWAYLAND}
CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm,wayland
. if empty(VULKAN_DRIVERS)
IGNORE= option WAYLAND is only valid on platforms with Vulkan
. endif
.endif
CONFIGURE_ARGS+= --with-dri-drivers="${DRI_DRIVERS:tl}" \
--with-gallium-drivers="${GALLIUM_DRIVERS:tl}" \
--with-vulkan-drivers="${VULKAN_DRIVERS:tl}"

5
graphics/mesa-libs/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
PORTREVISION= 2
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
@ -26,9 +27,9 @@ CONFIGURE_ARGS+= --with-dri-drivers="" --with-gallium-drivers=""
# libEGL needs gallium enabled which depends on llvm
.if "${MESA_LLVM_VER}" != ""
.if ${PORT_OPTIONS:MWAYLAND}
CONFIGURE_ARGS+= --with-platforms=x11,drm,wayland
CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm,wayland
.else
CONFIGURE_ARGS+= --with-platforms=x11,drm
CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm
.endif
PLIST_SUB+= EGL=""
.else

8
graphics/mesa-libs/pkg-plist
View file

@ -36,11 +36,11 @@ lib/libgbm.so.1.0.0
lib/libglapi.so
lib/libglapi.so.0
lib/libglapi.so.0.0.0
%%WAYLAND%%lib/libwayland-egl.so
%%WAYLAND%%lib/libwayland-egl.so.1
%%WAYLAND%%lib/libwayland-egl.so.1.0.0
@comment %%WAYLAND%%lib/libwayland-egl.so
@comment %%WAYLAND%%lib/libwayland-egl.so.1
@comment %%WAYLAND%%lib/libwayland-egl.so.1.0.0
%%EGL%%libdata/pkgconfig/egl.pc
libdata/pkgconfig/gbm.pc
libdata/pkgconfig/gl.pc
libdata/pkgconfig/glesv2.pc
%%WAYLAND%%libdata/pkgconfig/wayland-egl.pc
@comment %%WAYLAND%%libdata/pkgconfig/wayland-egl.pc

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