Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Sep 13, 2019
1 parent 5d46e1d commit 014ccd4
Show file tree
Hide file tree
Showing 242 changed files with 4,034 additions and 1,504 deletions.
2 changes: 1 addition & 1 deletion astro/routino/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= routino
PORTVERSION= 3.2
PORTVERSION= 3.3.1
CATEGORIES= astro
MASTER_SITES= http://www.routino.org/download/

Expand Down
6 changes: 3 additions & 3 deletions astro/routino/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1491683625
SHA256 (routino-3.2.tgz) = e2a431eaffbafab630835966d342e4ae25d5edb94c8ed419200e1ffb50bc7552
SIZE (routino-3.2.tgz) = 2463662
TIMESTAMP = 1568197606
SHA256 (routino-3.3.1.tgz) = a954565ab60a5abebc47e8c6e8b496f972e8dd781810fa5548b6d7a9e3e5e135
SIZE (routino-3.3.1.tgz) = 2541830
19 changes: 9 additions & 10 deletions astro/routino/files/patch-src_Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
--- src/Makefile.orig 2015-09-29 18:09:59 UTC
--- src/Makefile.orig 2018-10-30 19:12:36 UTC
+++ src/Makefile
@@ -38,9 +38,7 @@ EXE=planetsplitter$(.EXE) planetsplitter
router+lib$(.EXE) router+lib-slim$(.EXE)
@@ -39,8 +39,7 @@ EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) r

ifneq ($(HOST),MINGW)
-LIB =libroutino.so libroutino-slim.so
-LIB+=libroutino.so.$(SOVERSION) libroutino-slim.so.$(SOVERSION)
-LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
+LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
LIB =libroutino.so libroutino-slim.so
- LIB+=libroutino.so.$(SOVERSION) libroutino-slim.so.$(SOVERSION)
- LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
+ LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
else
LIB =routino.dll routino-slim.dll
LIB+=routino.def routino-slim.def
@@ -284,22 +282,23 @@ install-local: all-local
LIB =routino.dll routino-slim.dll
LIB+=routino.def routino-slim.def
@@ -284,22 +283,23 @@ install-local: all-local
@[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
@for file in $(EXE); do \
if [ -f $$file ]; then \
Expand Down
14 changes: 13 additions & 1 deletion astro/routino/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,13 @@ lib/libroutino.so.0.0.0
%%WWWDIR%%/data/translations.xml
%%WWWDIR%%/translations/router.html
%%WWWDIR%%/translations/translate.pl
%%WWWDIR%%/translations/translation.cs.txt
%%WWWDIR%%/translations/translation.de.txt
%%WWWDIR%%/translations/translation.en.txt
%%WWWDIR%%/translations/translation.es.txt
%%WWWDIR%%/translations/translation.fr.txt
%%WWWDIR%%/translations/translation.hu.txt
%%WWWDIR%%/translations/translation.it.txt
%%WWWDIR%%/translations/translation.nl.txt
%%WWWDIR%%/translations/translation.pl.txt
%%WWWDIR%%/translations/translation.ru.txt
Expand All @@ -83,7 +86,8 @@ lib/libroutino.so.0.0.0
%%WWWDIR%%/translations/visualiser.html
%%WWWDIR%%/www/leaflet/install.sh
%%WWWDIR%%/www/openlayers/install.sh
%%WWWDIR%%/www/openlayers/routino.cfg
%%WWWDIR%%/www/openlayers2/install.sh
%%WWWDIR%%/www/openlayers2/routino.cfg
%%WWWDIR%%/%%WWWDIR%%/.htaccess
%%WWWDIR%%/%%WWWDIR%%/documentation/algorithm.html
%%WWWDIR%%/%%WWWDIR%%/documentation/configuration.html
Expand Down Expand Up @@ -942,15 +946,19 @@ lib/libroutino.so.0.0.0
%%WWWDIR%%/%%WWWDIR%%/router.cgi
%%WWWDIR%%/%%WWWDIR%%/router.css
%%WWWDIR%%/%%WWWDIR%%/router.html
%%WWWDIR%%/%%WWWDIR%%/router.html.cs
%%WWWDIR%%/%%WWWDIR%%/router.html.de
%%WWWDIR%%/%%WWWDIR%%/router.html.en
%%WWWDIR%%/%%WWWDIR%%/router.html.es
%%WWWDIR%%/%%WWWDIR%%/router.html.fr
%%WWWDIR%%/%%WWWDIR%%/router.html.hu
%%WWWDIR%%/%%WWWDIR%%/router.html.it
%%WWWDIR%%/%%WWWDIR%%/router.html.nl
%%WWWDIR%%/%%WWWDIR%%/router.html.pl
%%WWWDIR%%/%%WWWDIR%%/router.html.ru
%%WWWDIR%%/%%WWWDIR%%/router.leaflet.js
%%WWWDIR%%/%%WWWDIR%%/router.openlayers.js
%%WWWDIR%%/%%WWWDIR%%/router.openlayers2.js
%%WWWDIR%%/%%WWWDIR%%/router.pl
%%WWWDIR%%/%%WWWDIR%%/search.cgi
%%WWWDIR%%/%%WWWDIR%%/search.pl
Expand All @@ -959,13 +967,17 @@ lib/libroutino.so.0.0.0
%%WWWDIR%%/%%WWWDIR%%/visualiser.cgi
%%WWWDIR%%/%%WWWDIR%%/visualiser.css
%%WWWDIR%%/%%WWWDIR%%/visualiser.html
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.cs
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.de
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.en
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.es
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.fr
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.hu
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.it
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.nl
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.pl
%%WWWDIR%%/%%WWWDIR%%/visualiser.html.ru
%%WWWDIR%%/%%WWWDIR%%/visualiser.leaflet.js
%%WWWDIR%%/%%WWWDIR%%/visualiser.openlayers.js
%%WWWDIR%%/%%WWWDIR%%/visualiser.openlayers2.js
@dir %%WWWDIR%%/results
4 changes: 2 additions & 2 deletions audio/linux-c7-alsa-plugins-oss/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ do-configure:
.if !empty(COMPAT32_CFLAGS_${ARCH})
@(cd ${WRKSRC32} && ${AUTORECONF} -f -i && ${SETENV} \
PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS} ${COMPAT32_CFLAGS_${ARCH}}" \
CFLAGS="${CFLAGS:N-march=*} ${COMPAT32_CFLAGS_${ARCH}}" \
LDFLAGS="${LDFLAGS}" MAKE="${LOCALBASE}/bin/gmake" \
MKDIR_P="${MKDIR}" PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
PKG_CONFIG_PATH=${LINUXBASE}/usr/lib/pkgconfig \
${CONFIG_ARGS})
.endif
@(cd ${WRKSRC} && ${AUTORECONF} -f -i && ${SETENV} \
PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
CFLAGS="${CFLAGS:N-march=*}" LDFLAGS="${LDFLAGS}" \
MAKE="${LOCALBASE}/bin/gmake" MKDIR_P="${MKDIR}" \
PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
PKG_CONFIG_PATH=${LINUXBASE}${LIBDIR_${ARCH}}/pkgconfig \
Expand Down
12 changes: 1 addition & 11 deletions chinese/pyzy/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ COMMENT= Chinese PinYin and Bopomofo conversion library

LICENSE= LGPL21

BROKEN_aarch64= fails to compile: constant expression evaluates to -1
BROKEN_armv6= fails to compile: constant expression evaluates to -1
BROKEN_armv7= fails to compile: constant expression evaluates to -1

LIB_DEPENDS= libsqlite3.so:databases/sqlite3

USE_GITHUB= yes
Expand All @@ -36,13 +32,7 @@ OPENCC_DESC= Use opencc for simplified and traditional Chinese conversion
OPENCC_CONFIGURE_ENABLE= opencc
OPENCC_LIB_DEPENDS= libopencc.so:chinese/opencc

.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == gcc
CXXFLAGS+= -Wno-error=narrowing
.endif

post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-1.0.so

.include <bsd.port.post.mk>
.include <bsd.port.mk>
22 changes: 22 additions & 0 deletions chinese/pyzy/files/patch-src_DoublePinyinContext.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- src/DoublePinyinContext.cc.orig 2019-09-09 19:45:16 UTC
+++ src/DoublePinyinContext.cc
@@ -352,7 +352,7 @@ DoublePinyinContext::isPinyin (int i)
return NULL;
}

- char sheng = ID_TO_SHENG (i);
+ signed char sheng = ID_TO_SHENG (i);

if (sheng == PINYIN_ID_VOID) {
return NULL;
@@ -365,8 +365,8 @@ inline const Pinyin *
DoublePinyinContext::isPinyin (int i, int j)
{
const Pinyin *pinyin = NULL;
- char sheng = ID_TO_SHENG (i);
- const char *yun = ID_TO_YUNS (j);
+ signed char sheng = ID_TO_SHENG (i);
+ const signed char *yun = ID_TO_YUNS (j);

do {
if (sheng == PINYIN_ID_VOID || yun[0] == PINYIN_ID_VOID)
121 changes: 121 additions & 0 deletions chinese/pyzy/files/patch-src_DoublePinyinTable.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
--- src/DoublePinyinTable.h.orig 2019-09-09 19:30:30 UTC
+++ src/DoublePinyinTable.h
@@ -26,7 +26,7 @@

#define PINYIN_ID_AEO PINYIN_ID_ZERO

-static const char double_pinyin_mspy_sheng[] = {
+static const signed char double_pinyin_mspy_sheng[] = {
PINYIN_ID_AEO, // A
PINYIN_ID_B, // B
PINYIN_ID_C, // C
@@ -55,7 +55,7 @@ static const char double_pinyin_mspy_sheng[] = {
PINYIN_ID_Z, // Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_mspy_yun[][2] = {
+static const signed char double_pinyin_mspy_yun[][2] = {
{ PINYIN_ID_A, PINYIN_ID_VOID }, // A
{ PINYIN_ID_OU, PINYIN_ID_VOID }, // B
{ PINYIN_ID_IAO, PINYIN_ID_VOID }, // C
@@ -84,7 +84,7 @@ static const char double_pinyin_mspy_yun[][2] = {
{ PINYIN_ID_EI, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_ING, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_zrm_sheng[] = {
+static const signed char double_pinyin_zrm_sheng[] = {
PINYIN_ID_AEO, // A
PINYIN_ID_B, // B
PINYIN_ID_C, // C
@@ -113,7 +113,7 @@ static const char double_pinyin_zrm_sheng[] = {
PINYIN_ID_Z, // Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_zrm_yun[][2] = {
+static const signed char double_pinyin_zrm_yun[][2] = {
{ PINYIN_ID_A, PINYIN_ID_VOID }, // A
{ PINYIN_ID_OU, PINYIN_ID_VOID }, // B
{ PINYIN_ID_IAO, PINYIN_ID_VOID }, // C
@@ -142,7 +142,7 @@ static const char double_pinyin_zrm_yun[][2] = {
{ PINYIN_ID_EI, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_abc_sheng[] = {
+static const signed char double_pinyin_abc_sheng[] = {
PINYIN_ID_ZH, // A
PINYIN_ID_B, // B
PINYIN_ID_C, // C
@@ -171,7 +171,7 @@ static const char double_pinyin_abc_sheng[] = {
PINYIN_ID_Z, // Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_abc_yun[][2] = {
+static const signed char double_pinyin_abc_yun[][2] = {
{ PINYIN_ID_A, PINYIN_ID_VOID }, // A
{ PINYIN_ID_OU, PINYIN_ID_VOID }, // B
{ PINYIN_ID_IN, PINYIN_ID_UAI }, // C
@@ -200,7 +200,7 @@ static const char double_pinyin_abc_yun[][2] = {
{ PINYIN_ID_IAO, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_zgpy_sheng[] = {
+static const signed char double_pinyin_zgpy_sheng[] = {
PINYIN_ID_CH, // A
PINYIN_ID_B, // B
PINYIN_ID_C, // C
@@ -229,7 +229,7 @@ static const char double_pinyin_zgpy_sheng[] = {
PINYIN_ID_Z, // Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_zgpy_yun[][2] = {
+static const signed char double_pinyin_zgpy_yun[][2] = {
{ PINYIN_ID_A, PINYIN_ID_VOID }, // A
{ PINYIN_ID_IAO, PINYIN_ID_VOID }, // B
{ PINYIN_ID_VOID, PINYIN_ID_VOID }, // C
@@ -258,7 +258,7 @@ static const char double_pinyin_zgpy_yun[][2] = {
{ PINYIN_ID_OU, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_ING, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_pyjj_sheng[] = {
+static const signed char double_pinyin_pyjj_sheng[] = {
PINYIN_ID_ZERO, // A
PINYIN_ID_B, // B
PINYIN_ID_C, // C
@@ -287,7 +287,7 @@ static const char double_pinyin_pyjj_sheng[] = {
PINYIN_ID_Z, // Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_pyjj_yun[][2] = {
+static const signed char double_pinyin_pyjj_yun[][2] = {
{ PINYIN_ID_A, PINYIN_ID_VOID }, // A
{ PINYIN_ID_IA, PINYIN_ID_UA }, // B
{ PINYIN_ID_UAN, PINYIN_ID_VOID }, // C
@@ -316,7 +316,7 @@ static const char double_pinyin_pyjj_yun[][2] = {
{ PINYIN_ID_UN, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_xhe_sheng[] = {
+static const signed char double_pinyin_xhe_sheng[] = {
PINYIN_ID_AEO, // A
PINYIN_ID_B, // B
PINYIN_ID_C, // C
@@ -345,7 +345,7 @@ static const char double_pinyin_xhe_sheng[] = {
PINYIN_ID_Z, // Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_xhe_yun[][2] = {
+static const signed char double_pinyin_xhe_yun[][2] = {
{ PINYIN_ID_A, PINYIN_ID_VOID }, // A
{ PINYIN_ID_IN, PINYIN_ID_VOID }, // B
{ PINYIN_ID_AO, PINYIN_ID_VOID }, // C
@@ -376,8 +376,8 @@ static const char double_pinyin_xhe_yun[][2] = {
};

static const struct {
- const char (&sheng)[27];
- const char (&yun)[27][2];
+ const signed char (&sheng)[27];
+ const signed char (&yun)[27][2];
} double_pinyin_map [] = {
{ double_pinyin_mspy_sheng, double_pinyin_mspy_yun },
{ double_pinyin_zrm_sheng, double_pinyin_zrm_yun },
2 changes: 1 addition & 1 deletion comms/openzwave-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COMMENT= Open-zwave - An open-source interface to Z-Wave networks

LICENSE= LGPL20

USES= gmake tar:bz2 iconv pkgconfig
USES= compiler:c++11-lang gmake iconv pkgconfig tar:bz2

# Manually update this when makefile is updated
# echo $(git describe --long --tags --dirty 2>/dev/null | sed s/^v//) | awk '{split($$0,a,"-"); print a[2]}'
Expand Down
1 change: 1 addition & 0 deletions databases/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
SUBDIR += frontbase-jdbc
SUBDIR += gadfly
SUBDIR += galera
SUBDIR += galera26
SUBDIR += gdbm
SUBDIR += geoserver-mysql-plugin
SUBDIR += gigabase
Expand Down
2 changes: 1 addition & 1 deletion databases/freetds-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= freetds
PORTVERSION= 1.1.51
PORTVERSION= 1.1.56
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= https://www.freetds.org/files/current/ \
Expand Down
6 changes: 3 additions & 3 deletions databases/freetds-devel/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1565555125
SHA256 (freetds-dev.1.1.51.tar.bz2) = 38501a906c8ab641a2e1c9acbe36892702b8d88669c5a39896f6894156a9574d
SIZE (freetds-dev.1.1.51.tar.bz2) = 2262275
TIMESTAMP = 1567764290
SHA256 (freetds-dev.1.1.56.tar.bz2) = a8d99201eaa32224e75d4e70d519c8a1a2b5c62b37c80c73480ee104470707b9
SIZE (freetds-dev.1.1.56.tar.bz2) = 2247109
71 changes: 71 additions & 0 deletions databases/galera26/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Created by: Nicolas Embriz <[email protected]>
# $FreeBSD$

PORTNAME= galera
PORTVERSION= 26.4.2
DISTVERSIONPREFIX= release_
CATEGORIES= databases
PKGNAMESUFFIX= 26

MAINTAINER= [email protected]
COMMENT= Synchronous multi-master replication engine

LICENSE= GPLv2

BROKEN_aarch64= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
BROKEN_armv6= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
BROKEN_armv7= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
NOT_FOR_ARCHS= i386
# On i386 older versions of clang produce:
# cannot compile this atomic library call yet ... __atomic_add_fetch
# whereas newer ones generate a call to __atomic_add_fetch which ends up with
# undefined reference at link time:
# undefined reference to `__atomic_fetch_add_8'
# https://bugs.llvm.org//show_bug.cgi?id=23262
# https://bugs.llvm.org//show_bug.cgi?id=24908
# https://tracker.crystax.net/issues/1263
NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386

BUILD_DEPENDS= checkmk:devel/check \
${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
LIB_DEPENDS= libboost_date_time.so:devel/boost-libs

USES= compiler:c++11-lang python:build scons ssl

USE_LDCONFIG= yes

USE_GITHUB= yes
GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src

LDFLAGS+= -lboost_program_options -lboost_system
MAKE_ARGS+= revno=${GH_TAGNAME} system_asio=0 tests=0

USE_RC_SUBR= garb.sh

# Abuse TEST_TARGET to append tests=1 (which is not a target, strictly
# speaking) at the end of the "scons ..." command so that it overrides
# tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove
# all *.passed files: find ./work -name *.passed -print -delete
TEST_TARGET= deterministic_tests=1 tests=1

PLIST_FILES= bin/garbd \
lib/libgalera.so \
lib/libgalera_smm.so

OPTIONS_DEFINE= BOOSTPOOL BPOSTATIC DEBUG

BOOSTPOOL_DESC= Use boost pool allocator
BPOSTATIC_DESC= Use static boost_program_options

BOOSTPOOL_MAKE_ARGS= boost_pool=1
BPOSTATIC_MAKE_ARGS= bpostatic=${LOCALBASE}/lib/libboost_program_options.a
DEBUG_MAKE_ARGS= debug=0

do-install:
${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/
${INSTALL_LIB} ${WRKSRC}/libgalera_smm.so ${STAGEDIR}${PREFIX}/lib/
@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
libgalera.so)

.include <bsd.port.mk>
Loading

0 comments on commit 014ccd4

Please sign in to comment.