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
fichtner committed Jul 15, 2020
1 parent f02e961 commit 35ec90a
Show file tree
Hide file tree
Showing 3,887 changed files with 85,666 additions and 40,578 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions accessibility/kmag/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1591712606
SHA256 (KDE/applications/20.04.2/kmag-20.04.2.tar.xz) = ad74e7131f5024e3291760759107923ae86d6c7ec887bcb850ac5e369fa9ee7e
SIZE (KDE/applications/20.04.2/kmag-20.04.2.tar.xz) = 674500
TIMESTAMP = 1594146928
SHA256 (KDE/release-service/20.04.3/kmag-20.04.3.tar.xz) = f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464
SIZE (KDE/release-service/20.04.3/kmag-20.04.3.tar.xz) = 674356
6 changes: 3 additions & 3 deletions accessibility/kmousetool/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1591712607
SHA256 (KDE/applications/20.04.2/kmousetool-20.04.2.tar.xz) = b175ef353d9957072d7a23846c7b893ef78f327e88921f5dc7f0e3926e1b680d
SIZE (KDE/applications/20.04.2/kmousetool-20.04.2.tar.xz) = 113348
TIMESTAMP = 1594146929
SHA256 (KDE/release-service/20.04.3/kmousetool-20.04.3.tar.xz) = acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715
SIZE (KDE/release-service/20.04.3/kmousetool-20.04.3.tar.xz) = 113316
6 changes: 3 additions & 3 deletions accessibility/kmouth/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1591712608
SHA256 (KDE/applications/20.04.2/kmouth-20.04.2.tar.xz) = a2260e2d6b0f30d2aac461c95b9969d75fac2b8901a6d4e3b0705e970a0917af
SIZE (KDE/applications/20.04.2/kmouth-20.04.2.tar.xz) = 1964676
TIMESTAMP = 1594146929
SHA256 (KDE/release-service/20.04.3/kmouth-20.04.3.tar.xz) = edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2
SIZE (KDE/release-service/20.04.3/kmouth-20.04.3.tar.xz) = 1964136
2 changes: 1 addition & 1 deletion accessibility/speech-dispatcher/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ USES= alias gettext gmake gnome libtool pathfix pkgconfig
USE_GNOME= glib20 intltool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-espeak-ng
CFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -fcommon -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
Expand Down
10 changes: 5 additions & 5 deletions arabic/libreoffice/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TIMESTAMP = 1590778599
SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_ar.tar.gz) = ed5980590fa9529c9061c6f46cc9c70248b6a631e557149eb3265a1f12eb26b5
SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_ar.tar.gz) = 1655105
SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_ar.tar.gz) = 831029269cae67610f5761fb087a86c6e769bfe5532514eee8486a2f510437df
SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_ar.tar.gz) = 2224552
TIMESTAMP = 1593834604
SHA256 (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_langpack_ar.tar.gz) = e6bd0bf927bafbf45539f5093362844e2d738e2fdfd953815c6b7670fa92f4be
SIZE (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_langpack_ar.tar.gz) = 1653263
SHA256 (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_helppack_ar.tar.gz) = 2822c1e072674d20fbf1e21e160cb0c64d6d8cb026e21477110c6641cc0ebc3e
SIZE (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_helppack_ar.tar.gz) = 2224253
2 changes: 1 addition & 1 deletion archivers/ark/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ ZIP_LIB_DEPENDS= libzip.so:archivers/libzip
ZIP_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_LibZip

# Override shared library version
KDE_APPLICATIONS_SHLIB_VER=20.4.2
KDE_APPLICATIONS_SHLIB_VER=20.4.3

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions archivers/ark/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1591712609
SHA256 (KDE/applications/20.04.2/ark-20.04.2.tar.xz) = ba2176a5ca3ca5de7bb38ff60d276c6cb85eb1533ae0dc76b3c4095fbde0bb96
SIZE (KDE/applications/20.04.2/ark-20.04.2.tar.xz) = 2587052
TIMESTAMP = 1594146930
SHA256 (KDE/release-service/20.04.3/ark-20.04.3.tar.xz) = e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc
SIZE (KDE/release-service/20.04.3/ark-20.04.3.tar.xz) = 2586436
3 changes: 1 addition & 2 deletions archivers/laszip/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= laszip
PORTVERSION= 3.2.9
PORTREVISION= 1
PORTVERSION= 3.4.3
CATEGORIES= archivers

MAINTAINER= [email protected]
Expand Down
6 changes: 3 additions & 3 deletions archivers/laszip/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1546017499
SHA256 (laszip-LASzip-3.2.9_GH0.tar.gz) = 8c74cb6cb5dda5a89eaf178f1884f7151536b5c6683778937cc45ddd47eb7018
SIZE (laszip-LASzip-3.2.9_GH0.tar.gz) = 231854
TIMESTAMP = 1593805343
SHA256 (laszip-LASzip-3.4.3_GH0.tar.gz) = 862715affa00609b78b4f469ab5529fee659c597efd40b5006b4305dd56c22d3
SIZE (laszip-LASzip-3.4.3_GH0.tar.gz) = 235628
4 changes: 2 additions & 2 deletions archivers/laszip/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include/laszip/laszip_api.h
include/laszip/laszip_api_version.h
lib/liblaszip.so
lib/liblaszip.so.8
lib/liblaszip.so.8.0.2
lib/liblaszip.so.8.0.5
lib/liblaszip_api.so
lib/liblaszip_api.so.8
lib/liblaszip_api.so.8.0.2
lib/liblaszip_api.so.8.0.5
2 changes: 1 addition & 1 deletion archivers/rar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= rar
PORTVERSION= 5.9.0
PORTVERSION= 5.9.1
PORTEPOCH= 3
CATEGORIES= archivers
MASTER_SITES= https://rarlab.com/rar/
Expand Down
10 changes: 5 additions & 5 deletions archivers/rar/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TIMESTAMP = 1585752007
SHA256 (rarbsd-5.9.0.tar.gz) = 3424b0e7823c52a579cbb67a86835a41c7f3d991b96c0eacebdb821302577ed3
SIZE (rarbsd-5.9.0.tar.gz) = 555525
SHA256 (rarbsd-x64-5.9.0.tar.gz) = 1a311b55ac33544b240577a90586e47e4b94047cc3b689ea040284dab159e52d
SIZE (rarbsd-x64-5.9.0.tar.gz) = 599381
TIMESTAMP = 1594308026
SHA256 (rarbsd-5.9.1.tar.gz) = e8494e82feb41f424cba701a9f859c4615dbc8ae3f2c48d280f377ec1a0fa48f
SIZE (rarbsd-5.9.1.tar.gz) = 555692
SHA256 (rarbsd-x64-5.9.1.tar.gz) = 3882ccfe5b0467d3f4efec75431b04a04706ac2fba2c664f7945fe74cc791a6f
SIZE (rarbsd-x64-5.9.1.tar.gz) = 599430
18 changes: 9 additions & 9 deletions archivers/unrar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# $FreeBSD$

PORTNAME= unrar
PORTVERSION= 5.90
PORTVERSION= 5.91
PORTEPOCH= 6
CATEGORIES+= archivers
MASTER_SITES= https://rarlab.com/rar/ \
LOCAL/sunpoet
DISTNAME= unrarsrc-5.9.2
DISTNAME= unrarsrc-5.9.4

MAINTAINER?= [email protected]
COMMENT= Extract, view & test RAR archives
Expand All @@ -21,21 +21,21 @@ USES+= compiler:c++11-lang

USE_HARDENING= pie:off safestack

OPTIONS_DEFINE= OPENSSL_AES
OPTIONS_DEFAULT=OPENSSL_AES
OPENSSL_AES_DESC= Use OpenSSL implementation of AES

CONFLICTS_INSTALL?= unrar-iconv

LDFLAGS+= -lpthread
MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" STRIP="${STRIP_CMD}"
MAKEFILE= makefile
WRKSRC= ${WRKDIR}/${PORTNAME}
WRKSRC= ${WRKDIR}/unrar

PLIST_FILES= bin/unrar

SLAVEDIRS= archivers/unrar-iconv

CONFLICTS_INSTALL?= unrar-iconv

OPTIONS_DEFINE= OPENSSL_AES
OPTIONS_DEFAULT=OPENSSL_AES
OPENSSL_AES_DESC= Use OpenSSL implementation of AES

OPENSSL_AES_CPPFLAGS= -DOPENSSL_AES -I${OPENSSLINC}
OPENSSL_AES_LDFLAGS= ${${OPENSSLLIB} == /usr/lib :? :-L${OPENSSLLIB}} -lcrypto
OPENSSL_AES_USES= ssl
Expand Down
6 changes: 3 additions & 3 deletions archivers/unrar/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1585752009
SHA256 (unrarsrc-5.9.2.tar.gz) = 73d3baf18cf0a197976af2794a848893c35e7d42cee0ff364c89d2e476ebdaa6
SIZE (unrarsrc-5.9.2.tar.gz) = 229900
TIMESTAMP = 1594117123
SHA256 (unrarsrc-5.9.4.tar.gz) = 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300
SIZE (unrarsrc-5.9.4.tar.gz) = 229921
2 changes: 1 addition & 1 deletion archivers/zoo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= zoo
PORTVERSION= 2.10.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/ \
LOCAL/ehaupt
Expand Down
14 changes: 14 additions & 0 deletions archivers/zoo/files/patch-zoodel.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- zoodel.c.orig 1991-07-16 15:58:46 UTC
+++ zoodel.c
@@ -138,7 +138,11 @@ if (*option == 'g') {

/* read archive header */
frd_zooh (&zoo_header, zoo_file);
+#ifdef __LP64__
+ if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0)
+#else
if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L)
+#endif
prterror ('f', failed_consistency);
if (ver_too_high (&zoo_header))
prterror ('f', wrong_version, zoo_header.major_ver, zoo_header.minor_ver);
14 changes: 14 additions & 0 deletions archivers/zoo/files/patch-zoopack.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- zoopack.c.orig 1993-05-01 03:59:21 UTC
+++ zoopack.c
@@ -139,7 +139,11 @@ if (zoo_file == NOFILE)
/* Read the header of the old archive. */
frd_zooh(&old_zoo_header, zoo_file);

+#ifdef __LP64__
+if ((int)(old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0) {
+#else
if ((old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0L) {
+#endif
prterror ('w', failed_consistency);
++bad_header; /* remember for future error message */
}
39 changes: 31 additions & 8 deletions astro/astrometry/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@

PORTNAME= astrometry
PORTVERSION= 0.80
PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= http://astrometry.net/downloads/
DISTNAME= ${PORTNAME}.net-${PORTVERSION}

MAINTAINER= [email protected]
COMMENT= Software for describing astronomical images
MAINTAINER= [email protected]
COMMENT= Astronomic calibration service

LICENSE= GPLv2

Expand All @@ -18,22 +19,44 @@ BROKEN_armv7= fails to link: os-features-test.c:10: undefined symbol 'canonical
BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libcairo.so:graphics/cairo \
libcfitsio.so:astro/cfitsio \
libgsl.so:math/gsl \
libpng.so:graphics/png \
libnetpbm.so:graphics/netpbm
libnetpbm.so:graphics/netpbm \
libwcs.so:astro/wcslib
RUN_DEPENDS= ${PYNUMPY}

USES= gmake jpeg pkgconfig python shebangfix
USES= gmake jpeg localbase pkgconfig python shebangfix
SHEBANG_FILES= bin/* blind/*.py sdss/*.py util/[!c]*.py
USE_LDCONFIG= ${PREFIX}/${PORTNAME}/lib
USE_LDCONFIG= yes

ALL_TARGET= all extra
MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME} \
MAKE_ARGS= NETPBM_INC="-I${LOCALBASE}/include/netpbm" \
NETPBM_LIB="-L${LOCALBASE}/lib -lnetpbm" \
SYSTEM_GSL=yes
MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX} \
DOC_INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}/doc \
EXAMPLE_INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}/examples \
MAN1_INSTALL_DIR=${STAGEDIR}${PREFIX}/man/man1 \
PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD}
MAKE_JOBS_UNSAFE= yes
# Changes search path in astrometry-engine
DATA_INSTALL_DIR= ${STAGEDIR}${DATADIR}
# Need this to get gzipped man pages
MANDIRS= ${MANPREFIX}/man/man1
SUB_FILES= pkg-message
LDFLAGS+= -lz

# DATA_INSTALL_DIR does not work globally :(
post-install:
@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \
${STAGEDIR}${PREFIX}/${PORTNAME}/etc/${PORTNAME}.cfg
@${REINPLACE_CMD} -i '' \
-e 's|${STAGEDIR}/usr/local/data|${DATADIR}|' \
${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg
@${RMDIR} ${STAGEDIR}${PREFIX}/data
@${MKDIR} ${STAGEDIR}${DATADIR}/sdss
@${MKDIR} ${STAGEDIR}${DATADIR}/blind
@${MKDIR} ${STAGEDIR}${DATADIR}/catalogs
${INSTALL_DATA} ${WRKSRC}/sdss/testdata/*.fit* ${STAGEDIR}${DATADIR}/sdss
${INSTALL_DATA} ${WRKSRC}/blind/index-9918.fits ${STAGEDIR}${DATADIR}/blind
${INSTALL_DATA} ${WRKSRC}/catalogs/*.fit* ${STAGEDIR}${DATADIR}/catalogs

.include <bsd.port.mk>
2 changes: 1 addition & 1 deletion astro/astrometry/files/os-features-config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#define NEED_DECLARE_QSORT_R 1
#define NEED_QSORT_R 0
#define NEED_SWAP_QSORT_R 0
#define HAVE_NETPBM 0
#define HAVE_NETPBM 1
7 changes: 5 additions & 2 deletions astro/astrometry/files/pkg-message.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
message: <<EOM
Astrometry was successfully installed.

You'll find this distribution in %%PREFIX%%/astrometry
You'll find this distribution under %%PREFIX%%. Examples are found
under %%PREFIX%%/astrometry/examples. See %%PREFIX%%/astrometry/doc/
for some info, more detailed at http://astrometry.net/use.html and
http://astrometry.net/doc/readme.html.

Although the code is released under a GPL license, you will also need
to download some data files, and these are distributed under different
license. See %%PREFIX%%/astrometry/doc/GETTING-INDEXES
license. Data files (indexes) should be stored under %%DATADIR%%/
EOM
}
]
Loading

0 comments on commit 35ec90a

Please sign in to comment.