Date: Tue, 29 Mar 2016 01:37:14 +0200 From: Carlos J Puga Medina <cpm@fbsd.es> To: "Carlos J. Puga Medina" <cpm@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r412077 - in head: multimedia/mpv security/libgcrypt security/libgcrypt/files Message-ID: <1459208234.1418.7.camel@fbsd.es> In-Reply-To: <201603282341.u2SNfjkK064803@repo.freebsd.org> References: <201603282341.u2SNfjkK064803@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-lQOhfZ/FvpthLOUtCDrj Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2016-03-28 at 23:41 +0000, Carlos J. Puga Medina wrote: Oops, I think I need more coffee! The multimedia/mpv changes should have committed in a separate commit and should say PR 202588. > Author: cpm > Date: Mon Mar 28 23:41:45 2016 > New Revision: 412077 > URL: https://svnweb.freebsd.org/changeset/ports/412077 >=20 > Log: > =C2=A0 - cipher/salsa20.c (selftest): Ensure 16-byte alignment for salsa2= 0 > =C2=A0 context structure. > =C2=A0=C2=A0 > =C2=A0 - mpi/longlong.h: Fix build on sparc. > =C2=A0=C2=A0 > =C2=A0 PR: 206919 > =C2=A0 Approved by: junovitch (mentor) >=20 > Added: > =C2=A0 head/security/libgcrypt/files/patch-cipher_salsa20.c=C2=A0=C2=A0= =C2=A0(contents, > props changed) > =C2=A0 head/security/libgcrypt/files/patch-mpi_longlong.h=C2=A0=C2=A0=C2= =A0(contents, > props changed) > Deleted: > =C2=A0 head/security/libgcrypt/files/patch-cipher-Makefile.in > Modified: > =C2=A0 head/multimedia/mpv/Makefile > =C2=A0 head/security/libgcrypt/Makefile >=20 > Modified: head/multimedia/mpv/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/multimedia/mpv/Makefile Mon Mar 28 23:05:43 2016=09 > (r412076) > +++ head/multimedia/mpv/Makefile Mon Mar 28 23:41:45 2016=09 > (r412077) > @@ -4,6 +4,7 @@ > =C2=A0PORTNAME=3D mpv > =C2=A0PORTVERSION=3D 0.16.0 > =C2=A0DISTVERSIONPREFIX=3D v > +PORTREVISION=3D 1 > =C2=A0PORTEPOCH=3D 1 > =C2=A0CATEGORIES=3D multimedia audio > =C2=A0 > @@ -44,7 +45,7 @@ OPTIONS_DEFAULT=3D ASS DVDREAD DVDNAV ENCA > =C2=A0OPTIONS_GROUP=3D IN VO AO > =C2=A0OPTIONS_GROUP_IN=3D CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB > =C2=A0OPTIONS_GROUP_VO=3D CACA OPENGL VAAPI VDPAU X11 XINERAMA > -OPTIONS_GROUP_AO=3D ALSA JACK PULSEAUDIO > +OPTIONS_GROUP_AO=3D ALSA JACK PULSEAUDIO SDL > =C2=A0OPTIONS_SUB=3D yes > =C2=A0 > =C2=A0ASS_DESC=3D ASS/SSA subtitle and OSD rendering > @@ -104,6 +105,10 @@ OPENGL_IMPLIES=3D X11 > =C2=A0PULSEAUDIO_LIB_DEPENDS=3D libpulse.so:${PORTSDIR}/audio > /pulseaudio > =C2=A0PULSEAUDIO_CONFIGURE_OFF=3D --disable-pulse > =C2=A0 > +SDL_USE=3D SDL=3Dsdl2 > +SDL_CONFIGURE_ON=3D --enable-sdl2 > +SDL_CONFIGURE_OFF=3D --disable-sdl2 > + > =C2=A0SMB_LIB_DEPENDS=3D libsmbclient.so:${PORTSDIR}/net/samb > a-libsmbclient > =C2=A0SMB_CONFIGURE_OFF=3D --disable-libsmbclient > =C2=A0 > @@ -135,11 +140,6 @@ ZSH_CONFIGURE_ENABLE=3D zsh-comp > =C2=A0 > =C2=A0.include <bsd.port.options.mk> > =C2=A0 > -# Fix crash on i386 > -.if ${ARCH} =3D=3D "i386" > -CFLAGS:=3D ${CFLAGS:N-O*} -O0 > -.endif > - > =C2=A0post-patch: > =C2=A0 @${REINPLACE_CMD} -e > 's|/pkgconfig/mpv.pc|data/pkgconfig/mpv.pc|g' \ > =C2=A0 ${WRKSRC}/wscript_build.py >=20 > Modified: head/security/libgcrypt/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/security/libgcrypt/Makefile Mon Mar 28 23:05:43 2016=09 > (r412076) > +++ head/security/libgcrypt/Makefile Mon Mar 28 23:41:45 2016=09 > (r412077) > @@ -2,6 +2,7 @@ > =C2=A0 > =C2=A0PORTNAME=3D libgcrypt > =C2=A0PORTVERSION=3D 1.6.5 > +PORTREVISION=3D 1 > =C2=A0CATEGORIES=3D security > =C2=A0MASTER_SITES=3D GNUPG > =C2=A0 > @@ -40,11 +41,6 @@ post-patch: > =C2=A0 ${RM} -f ${WRKSRC}/doc/gcrypt.info* > =C2=A0 ${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' > ${WRKSRC}/mpi/i386/*.S > =C2=A0 > -# Fix crash at cipher/salsa20.c module on amd64 > -.if ${ARCH} =3D=3D "amd64" && exists(/usr/bin/clang) > -CFLAGS:=3D ${CFLAGS:N-O*} -O2 > -.endif > - > =C2=A0post-install: > =C2=A0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so > =C2=A0 >=20 > Added: head/security/libgcrypt/files/patch-cipher_salsa20.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/security/libgcrypt/files/patch-cipher_salsa20.c Mon > Mar 28 23:41:45 2016 (r412077) > @@ -0,0 +1,62 @@ > +--- cipher/salsa20.c.orig 2016-03-23 16:34:00 UTC > ++++ cipher/salsa20.c > +@@ -485,7 +485,8 @@ salsa20r12_encrypt_stream (void *context > + static const char* > + selftest (void) > + { > +-=C2=A0=C2=A0SALSA20_context_t ctx; > ++=C2=A0=C2=A0byte ctxbuf[sizeof(SALSA20_context_t) + 15]; > ++=C2=A0=C2=A0SALSA20_context_t *ctx; > +=C2=A0=C2=A0=C2=A0byte scratch[8+1]; > +=C2=A0=C2=A0=C2=A0byte buf[256+64+4]; > +=C2=A0=C2=A0=C2=A0int i; > +@@ -502,32 +503,35 @@ selftest (void) > +=C2=A0=C2=A0=C2=A0static const byte ciphertext_1[] =3D > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{ 0xE3, 0xBE, 0x8F, 0xDD, 0x8B, 0xEC, 0xA2= , 0xE3}; > +=C2=A0 > +-=C2=A0=C2=A0salsa20_setkey (&ctx, key_1, sizeof key_1); > +-=C2=A0=C2=A0salsa20_setiv=C2=A0=C2=A0(&ctx, nonce_1, sizeof nonce_1); > ++=C2=A0=C2=A0/* 16-byte alignment required for amd64 implementation. */ > ++=C2=A0=C2=A0ctx =3D (SALSA20_context_t *)((uintptr_t)(ctxbuf + 15) & > ~(uintptr_t)15); > ++ > ++=C2=A0=C2=A0salsa20_setkey (ctx, key_1, sizeof key_1); > ++=C2=A0=C2=A0salsa20_setiv=C2=A0=C2=A0(ctx, nonce_1, sizeof nonce_1); > +=C2=A0=C2=A0=C2=A0scratch[8] =3D 0; > +-=C2=A0=C2=A0salsa20_encrypt_stream (&ctx, scratch, plaintext_1, sizeof > plaintext_1); > ++=C2=A0=C2=A0salsa20_encrypt_stream (ctx, scratch, plaintext_1, sizeof > plaintext_1); > +=C2=A0=C2=A0=C2=A0if (memcmp (scratch, ciphertext_1, sizeof ciphertext_1= )) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return "Salsa20 encryption test 1 failed."= ; > +=C2=A0=C2=A0=C2=A0if (scratch[8]) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return "Salsa20 wrote too much."; > +-=C2=A0=C2=A0salsa20_setkey( &ctx, key_1, sizeof(key_1)); > +-=C2=A0=C2=A0salsa20_setiv=C2=A0=C2=A0(&ctx, nonce_1, sizeof nonce_1); > +-=C2=A0=C2=A0salsa20_encrypt_stream (&ctx, scratch, scratch, sizeof > plaintext_1); > ++=C2=A0=C2=A0salsa20_setkey( ctx, key_1, sizeof(key_1)); > ++=C2=A0=C2=A0salsa20_setiv=C2=A0=C2=A0(ctx, nonce_1, sizeof nonce_1); > ++=C2=A0=C2=A0salsa20_encrypt_stream (ctx, scratch, scratch, sizeof > plaintext_1); > +=C2=A0=C2=A0=C2=A0if (memcmp (scratch, plaintext_1, sizeof plaintext_1)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return "Salsa20 decryption test 1 failed."= ; > +=C2=A0 > +=C2=A0=C2=A0=C2=A0for (i =3D 0; i < sizeof buf; i++) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0buf[i] =3D i; > +-=C2=A0=C2=A0salsa20_setkey (&ctx, key_1, sizeof key_1); > +-=C2=A0=C2=A0salsa20_setiv (&ctx, nonce_1, sizeof nonce_1); > ++=C2=A0=C2=A0salsa20_setkey (ctx, key_1, sizeof key_1); > ++=C2=A0=C2=A0salsa20_setiv (ctx, nonce_1, sizeof nonce_1); > +=C2=A0=C2=A0=C2=A0/*encrypt*/ > +-=C2=A0=C2=A0salsa20_encrypt_stream (&ctx, buf, buf, sizeof buf); > ++=C2=A0=C2=A0salsa20_encrypt_stream (ctx, buf, buf, sizeof buf); > +=C2=A0=C2=A0=C2=A0/*decrypt*/ > +-=C2=A0=C2=A0salsa20_setkey (&ctx, key_1, sizeof key_1); > +-=C2=A0=C2=A0salsa20_setiv (&ctx, nonce_1, sizeof nonce_1); > +-=C2=A0=C2=A0salsa20_encrypt_stream (&ctx, buf, buf, 1); > +-=C2=A0=C2=A0salsa20_encrypt_stream (&ctx, buf+1, buf+1, (sizeof buf)-1-= 1); > +-=C2=A0=C2=A0salsa20_encrypt_stream (&ctx, buf+(sizeof buf)-1, buf+(size= of > buf)-1, 1); > ++=C2=A0=C2=A0salsa20_setkey (ctx, key_1, sizeof key_1); > ++=C2=A0=C2=A0salsa20_setiv (ctx, nonce_1, sizeof nonce_1); > ++=C2=A0=C2=A0salsa20_encrypt_stream (ctx, buf, buf, 1); > ++=C2=A0=C2=A0salsa20_encrypt_stream (ctx, buf+1, buf+1, (sizeof buf)-1-1= ); > ++=C2=A0=C2=A0salsa20_encrypt_stream (ctx, buf+(sizeof buf)-1, buf+(sizeo= f > buf)-1, 1); > +=C2=A0=C2=A0=C2=A0for (i =3D 0; i < sizeof buf; i++) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (buf[i] !=3D (byte)i) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return "Salsa20 encryption tes= t 2 failed."; >=20 > Added: head/security/libgcrypt/files/patch-mpi_longlong.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/security/libgcrypt/files/patch-mpi_longlong.h Mon Mar > 28 23:41:45 2016 (r412077) > @@ -0,0 +1,27 @@ > +--- mpi/longlong.h.orig 2016-03-23 17:33:08 UTC > ++++ mpi/longlong.h > +@@ -170,6 +170,7 @@ MA 02111-1307, USA. */ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(pl) =3D __m0 * __m1;=C2=A0 =09 > \ > +=C2=A0=C2=A0=C2=A0} while (0) > + #define UMUL_TIME 46 > ++#if 0 > + #ifndef LONGLONG_STANDALONE > + #define udiv_qrnnd(q, r, n1, n0, d) \ > +=C2=A0=C2=A0=C2=A0do { UDItype __r; =09 > \ > +@@ -179,6 +180,7 @@ MA 02111-1307, USA. */ > + extern UDItype __udiv_qrnnd (); > + #define UDIV_TIME 220 > + #endif /* LONGLONG_STANDALONE */ > ++#endif /* 0 */ > + #endif /* __alpha */ > +=C2=A0 > + /*************************************** > +@@ -1287,7 +1289,7 @@ typedef unsigned int UTItype __attribute > +=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"rJ" > ((USItype)(al)),=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0\ > +=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"rI" > ((USItype)(bl))=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0\ > +=C2=A0 =C2=A0=C2=A0=C2=A0__CLOBBER_CC) > +-#if defined (__sparc_v8__) || defined(__sparcv8) > ++#if defined (__sparc_v8__) || defined(__sparcv8) || defined > (__sparc__) > + /* Don't match immediate range because, 1) it is not often useful, > +=C2=A0=C2=A0=C2=A0=C2=A02) the 'I' flag thinks of the range as a 13 bit = signed interval, > +=C2=A0=C2=A0=C2=A0=C2=A0while we want to match a 13 bit interval, sign e= xtended to 32 > bits, >=20 --=20 Carlos Jacobo Puga Medina <cpm@fbsd.es> PGP fingerprint =3D C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453 --=-lQOhfZ/FvpthLOUtCDrj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAABCgBmBQJW+cAqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDNjBFOTQ5NzUzMDI3OTNCQ0MyREJCODlB MUYzNUQ2NkU2RDA1NDUzAAoJEKHzXWbm0FRTQcUH/2hU0O2h88hgQKEfPKVjePtc LdicJH6t0pd+89epvPeb66EYQHGMVF90vqw4rAxHFzPBiZTcEmYqFW8cNyMFK9Js 43FkM47fl4gwokCtrA0VzmvyxdVKxTs6eF/UYRWXJIqbxYyKjqURJjRoF+S3FK8t gh8NhFZYT5A26/URO+l3VFj6waff20dKivHM7QmRVWR/GiOVXFVqH6Lc2jqPmU1J sgjdrtA9VPwypgedDv90hSrb6W05b99s1xlg2bmi6LXZ4qvp8tBwOxlAHCvRa2lo AoDKtsz6lKhAACn7Du0jcpNLfMIwlN/QtrrtDHKyNuP3fjEfVN8MFBIKAvdnI4k= =NI8H -----END PGP SIGNATURE----- --=-lQOhfZ/FvpthLOUtCDrj--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1459208234.1418.7.camel>