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 Nov 14, 2019
1 parent 1a91797 commit 0ae3118
Show file tree
Hide file tree
Showing 366 changed files with 1,920 additions and 1,172 deletions.
2 changes: 1 addition & 1 deletion archivers/p5-Compress-Raw-Bzip2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= Compress-Raw-Bzip2
PORTVERSION= 2.089
PORTVERSION= 2.090
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Expand Down
6 changes: 3 additions & 3 deletions archivers/p5-Compress-Raw-Bzip2/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572971643
SHA256 (Compress-Raw-Bzip2-2.089.tar.gz) = f208783323c21ea998a95c46e649ffda37db8435f524d29f84dc3459ba2880e7
SIZE (Compress-Raw-Bzip2-2.089.tar.gz) = 138203
TIMESTAMP = 1573649154
SHA256 (Compress-Raw-Bzip2-2.090.tar.gz) = e6a28104f4b5689384e94f539af5e262e951eb310764858b511e4443a338297a
SIZE (Compress-Raw-Bzip2-2.090.tar.gz) = 138242
2 changes: 1 addition & 1 deletion archivers/p5-Compress-Raw-Lzma/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= Compress-Raw-Lzma
PORTVERSION= 2.089
PORTVERSION= 2.090
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Expand Down
6 changes: 3 additions & 3 deletions archivers/p5-Compress-Raw-Lzma/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572971646
SHA256 (Compress-Raw-Lzma-2.089.tar.gz) = 69cb59dcf0848249688b004b90a9ed0ec2213811de94a309a183008ee630a941
SIZE (Compress-Raw-Lzma-2.089.tar.gz) = 115606
TIMESTAMP = 1573649156
SHA256 (Compress-Raw-Lzma-2.090.tar.gz) = 7202e9d6611f2b6e2359cc9b1aa23ef96d7e33b30ac3f740d06b89e914762077
SIZE (Compress-Raw-Lzma-2.090.tar.gz) = 115774
2 changes: 1 addition & 1 deletion archivers/p5-Compress-Raw-Zlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= Compress-Raw-Zlib
PORTVERSION= 2.089
PORTVERSION= 2.090
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Expand Down
6 changes: 3 additions & 3 deletions archivers/p5-Compress-Raw-Zlib/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572971648
SHA256 (Compress-Raw-Zlib-2.089.tar.gz) = 9ff8b0e8eb5568040cd5cc78eaccaac05cebaa756443201bb76663b40881f677
SIZE (Compress-Raw-Zlib-2.089.tar.gz) = 254408
TIMESTAMP = 1573649158
SHA256 (Compress-Raw-Zlib-2.090.tar.gz) = f2c8499abcc7df90b8ccc3767b870cbd09d305b84b251a9573237ef2cf9eaf59
SIZE (Compress-Raw-Zlib-2.090.tar.gz) = 254413
2 changes: 1 addition & 1 deletion archivers/p5-IO-Compress-Lzf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= IO-Compress-Lzf
PORTVERSION= 2.089
PORTVERSION= 2.090
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Expand Down
6 changes: 3 additions & 3 deletions archivers/p5-IO-Compress-Lzf/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572971654
SHA256 (IO-Compress-Lzf-2.089.tar.gz) = 8290dc06c56182ced9d1bda83854fdc8f0d79a43331cfc82489f9bdb23adc048
SIZE (IO-Compress-Lzf-2.089.tar.gz) = 76088
TIMESTAMP = 1573649162
SHA256 (IO-Compress-Lzf-2.090.tar.gz) = aa3a3d7396bdebe1b95d789bb9f25af784f45ff605baf475021a2364098fbb17
SIZE (IO-Compress-Lzf-2.090.tar.gz) = 76092
2 changes: 1 addition & 1 deletion archivers/p5-IO-Compress-Lzma/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= IO-Compress-Lzma
PORTVERSION= 2.089
PORTVERSION= 2.090
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Expand Down
6 changes: 3 additions & 3 deletions archivers/p5-IO-Compress-Lzma/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572971657
SHA256 (IO-Compress-Lzma-2.089.tar.gz) = db3fcb957d9b6a59f814f900331627bcf8d4a23b5aa7bc27aa5c97841d3dad03
SIZE (IO-Compress-Lzma-2.089.tar.gz) = 100060
TIMESTAMP = 1573649164
SHA256 (IO-Compress-Lzma-2.090.tar.gz) = 32489f9c6fe247442531b9f72a8408cd0416510cab8d7154ef78961315d430a5
SIZE (IO-Compress-Lzma-2.090.tar.gz) = 100116
2 changes: 1 addition & 1 deletion archivers/p5-IO-Compress-Lzop/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= IO-Compress-Lzop
PORTVERSION= 2.089
PORTVERSION= 2.090
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Expand Down
6 changes: 3 additions & 3 deletions archivers/p5-IO-Compress-Lzop/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572971659
SHA256 (IO-Compress-Lzop-2.089.tar.gz) = edc20a84539c65365da952cd34b8e7f846642ed48af1d1debad9402ba4109811
SIZE (IO-Compress-Lzop-2.089.tar.gz) = 80941
TIMESTAMP = 1573649166
SHA256 (IO-Compress-Lzop-2.090.tar.gz) = 4979d652eb950088cdc2931d56120420adab5d56879ad7aace06f262f701e1f2
SIZE (IO-Compress-Lzop-2.090.tar.gz) = 80942
2 changes: 1 addition & 1 deletion archivers/p5-IO-Compress/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= IO-Compress
PORTVERSION= 2.089
PORTVERSION= 2.090
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Expand Down
6 changes: 3 additions & 3 deletions archivers/p5-IO-Compress/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572971652
SHA256 (IO-Compress-2.089.tar.gz) = 2d3474fc34cf729660a92c481ed7a141434389a36af9c8341603945e11bc5005
SIZE (IO-Compress-2.089.tar.gz) = 276924
TIMESTAMP = 1573649160
SHA256 (IO-Compress-2.090.tar.gz) = 4c12e54a83f993372d43dd67389a1ca92b5c33c108c7f86768a4797cd994e987
SIZE (IO-Compress-2.090.tar.gz) = 277159
5 changes: 2 additions & 3 deletions archivers/unrar/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
# $FreeBSD$

PORTNAME= unrar
DISTVERSION= 5.71
PORTREVISION= 1
PORTVERSION= 5.80
PORTEPOCH= 6
CATEGORIES+= archivers
MASTER_SITES= https://rarlab.com/rar/ \
LOCAL/sunpoet
DISTNAME= unrarsrc-5.7.5
DISTNAME= unrarsrc-5.8.3

MAINTAINER?= [email protected]
COMMENT= Extract, view & test RAR archives
Expand Down
6 changes: 3 additions & 3 deletions archivers/unrar/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1556560993
SHA256 (unrarsrc-5.7.5.tar.gz) = e1c2fddaa87a88b1535bfc10ca484f3c5af4e5a55fbb933f8819e26203bbe2ee
SIZE (unrarsrc-5.7.5.tar.gz) = 228818
TIMESTAMP = 1573554645
SHA256 (unrarsrc-5.8.3.tar.gz) = 3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6
SIZE (unrarsrc-5.8.3.tar.gz) = 229162
11 changes: 11 additions & 0 deletions archivers/urbackup-client/files/patch-m4_ax__check__openssl.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- m4/ax_check_openssl.m4.orig 2019-11-11 19:52:41 UTC
+++ m4/ax_check_openssl.m4
@@ -53,7 +53,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
# then use that information and don't search ssldirs
AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
if test x"$PKG_CONFIG" != x""; then
- OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
+ OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null | sed 's|-L/usr/lib||g'`
if test $? = 0; then
OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
2 changes: 1 addition & 1 deletion astro/mkgmap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= mkgmap
PORTVERSION= r4339
PORTVERSION= r4363
CATEGORIES= astro converters java
MASTER_SITES= http://www.mkgmap.org.uk/download/ \
http://mirror.amdmi3.ru/distfiles/
Expand Down
6 changes: 3 additions & 3 deletions astro/mkgmap/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1572961207
SHA256 (mkgmap-r4339.tar.gz) = ca8149bdf3b43352d2125e858e050b24f4175062ec2438e5a7ad6e045d71972a
SIZE (mkgmap-r4339.tar.gz) = 3386176
TIMESTAMP = 1573678467
SHA256 (mkgmap-r4363.tar.gz) = 3b7c03ee557ec7febe381ec14380c2f2319ad21af62277c8c91e26f94b629b92
SIZE (mkgmap-r4363.tar.gz) = 3392468
8 changes: 8 additions & 0 deletions audio/clunk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= clunk
PORTVERSION= 1.3.261
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/clunk

Expand All @@ -20,4 +21,11 @@ OPTIONS_DEFINE= SSE
OPTIONS_DEFAULT_amd64=SSE
SSE_CMAKE_ON= -DWITH_SSE:BOOL=TRUE

post-install:
${INSTALL_DATA} ${WRKSRC}/clunk/types.h ${STAGEDIR}${PREFIX}/include/clunk
${INSTALL_DATA} ${WRKSRC}/clunk/audio_spec.h ${STAGEDIR}${PREFIX}/include/clunk
@${MKDIR} ${STAGEDIR}${PREFIX}/include/clunk/backend/sdl
${INSTALL_DATA} ${WRKSRC}/clunk/backend/sdl/locker.h ${STAGEDIR}${PREFIX}/include/clunk/backend/sdl
${MV} ${STAGEDIR}${PREFIX}/include/clunk/backend.h ${STAGEDIR}${PREFIX}/include/clunk/backend/sdl

.include <bsd.port.mk>
5 changes: 4 additions & 1 deletion audio/clunk/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
include/clunk/backend.h
include/clunk/audio_spec.h
include/clunk/backend/sdl/backend.h
include/clunk/backend/sdl/locker.h
include/clunk/buffer.h
include/clunk/clunk.h
include/clunk/clunk_assert.h
Expand All @@ -18,6 +20,7 @@ include/clunk/sample.h
include/clunk/source.h
include/clunk/sse_fft_context.h
include/clunk/stream.h
include/clunk/types.h
include/clunk/v3.h
include/clunk/window_function.h
lib/libclunk.so
2 changes: 1 addition & 1 deletion audio/libmad/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= libmad
PORTVERSION= 0.15.1b
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION}

Expand Down
175 changes: 175 additions & 0 deletions audio/libmad/files/patch-layer12.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
Obtained from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508133#15

--- layer12.c.orig 2004-02-05 09:02:39 UTC
+++ layer12.c
@@ -134,6 +134,12 @@ int mad_layer_I(struct mad_stream *strea
for (sb = 0; sb < bound; ++sb) {
for (ch = 0; ch < nch; ++ch) {
nb = mad_bit_read(&stream->ptr, 4);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }

if (nb == 15) {
stream->error = MAD_ERROR_BADBITALLOC;
@@ -146,6 +152,12 @@ int mad_layer_I(struct mad_stream *strea

for (sb = bound; sb < 32; ++sb) {
nb = mad_bit_read(&stream->ptr, 4);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }

if (nb == 15) {
stream->error = MAD_ERROR_BADBITALLOC;
@@ -162,6 +174,12 @@ int mad_layer_I(struct mad_stream *strea
for (ch = 0; ch < nch; ++ch) {
if (allocation[ch][sb]) {
scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }

# if defined(OPT_STRICT)
/*
@@ -187,6 +205,12 @@ int mad_layer_I(struct mad_stream *strea
frame->sbsample[ch][s][sb] = nb ?
mad_f_mul(I_sample(&stream->ptr, nb),
sf_table[scalefactor[ch][sb]]) : 0;
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }
}
}
@@ -195,6 +219,12 @@ int mad_layer_I(struct mad_stream *strea
mad_fixed_t sample;
sample = I_sample(&stream->ptr, nb);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }
for (ch = 0; ch < nch; ++ch) {
frame->sbsample[ch][s][sb] =
@@ -403,7 +433,15 @@ int mad_layer_II(struct mad_stream *stre
nbal = bitalloc_table[offsets[sb]].nbal;
for (ch = 0; ch < nch; ++ch)
+ {
allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }
+ }
}
for (sb = bound; sb < sblimit; ++sb) {
@@ -411,6 +449,13 @@ int mad_layer_II(struct mad_stream *stre
allocation[0][sb] =
allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
+
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }
}
/* decode scalefactor selection info */
@@ -419,6 +464,12 @@ int mad_layer_II(struct mad_stream *stre
for (ch = 0; ch < nch; ++ch) {
if (allocation[ch][sb])
scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }
}
}

@@ -442,6 +493,12 @@ int mad_layer_II(struct mad_stream *stre
for (ch = 0; ch < nch; ++ch) {
if (allocation[ch][sb]) {
scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }

switch (scfsi[ch][sb]) {
case 2:
@@ -452,11 +509,23 @@ int mad_layer_II(struct mad_stream *stre

case 0:
scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }
/* fall through */

case 1:
case 3:
scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }
}

if (scfsi[ch][sb] & 1)
@@ -488,6 +557,12 @@ int mad_layer_II(struct mad_stream *stre
index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];

II_samples(&stream->ptr, &qc_table[index], samples);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }

for (s = 0; s < 3; ++s) {
frame->sbsample[ch][3 * gr + s][sb] =
@@ -506,6 +581,12 @@ int mad_layer_II(struct mad_stream *stre
index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];

II_samples(&stream->ptr, &qc_table[index], samples);
+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
+ {
+ stream->error = MAD_ERROR_LOSTSYNC;
+ stream->sync = 0;
+ return -1;
+ }

for (ch = 0; ch < nch; ++ch) {
for (s = 0; s < 3; ++s) {
Loading

0 comments on commit 0ae3118

Please sign in to comment.