Re: clang breakage: memtest86+
On Fri, Aug 11 2017, Mike Larkin wrote:
> On Fri, Aug 11, 2017 at 05:29:23PM -0400, Jeremie Courreges-Anglas wrote:
>> On Fri, Aug 11 2017, Jeremie Courreges-Anglas wrote:
>> > On Fri, Aug 11 2017, Christian Weisgerber wrote:
>> >> On 2017-08-10, Jeremie Courreges-Anglas wrote:
>> >>
>> >>> +# XXX base gcc
>> >>> +CC= /usr/bin/gcc
>> >
>> > Thanks for the test reports, which confirm that I'm the only one unable
>> > to run memtest86+ on my machines...
>> >
>> >> That isn't a solution.
>> >
>> > It is a solution, just not a long-term one. ;)
>> >
>> > So here's a diff I just cooked up (I don't know where I've put the
>> > previous version...). While here, respect CC. Note that as(1) is still
>> > used once, which could be a problem on a clang-only box.
>> >
>> > Tests welcome.
>>
>> So with this diff memtest86+ doesn't work any more on naddy's x230
>> (it did with /usr/bin/gcc). Using gcc from ports doesn't help.
>>
>
> I was trying just now to take a look at why it fails (since I also have
> an x230) but it doesn't even build for me with clang at all:
>
> cc -c -O2 -pipe -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin
> -ffreestanding -fPIC -fno-stack-protector -fno-pie -fno-strict-aliasing
> reloc.c
> reloc.c:50:10: warning: variable 'got' is uninitialized when used here
> [-Wuninitialized]
> return *got;
> ^~~
> reloc.c:49:26: note: initialize the variable 'got' to silence this warning
> register Elf32_Addr *got asm ("%ebx");
> ^
> = NULL
> 1 warning generated.
> cc -O2 -pipe -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin
> -ffreestanding -fPIC -fno-stack-protector -fno-pie -c -o main.o main.c
> main.c:115:7: warning: passing 'volatile ulong *' (aka 'volatile unsigned
> long *') to parameter of type 'const void *' discards qualifiers
> [-Wincompatible-pointer-types-discards-qualifiers]
> goto *p;
> ^~
> main.c:115:2: error: indirect goto in function with no address-of-label
> expressions
> goto *p;
> ^
> 1 warning and 1 error generated.
> gmake: *** [: main.o] Error 1
> *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705
> '/usr/ports/pobj/memtest86+-4.20/.build_done')
> *** Error 1 in /usr/ports/sysutils/memtest86+
> (/usr/ports/infrastructure/mk/bsd.port.mk:2408 'all')
>
> If someone can give me a clue why, I can see if I can debug it further.
clang just doesn't support this kind of code. Here's naddy's patch
which is better than mine in my opinion (still hackish, but more
readable).
Note that I've committed recent changes to the port, make sure you use
cvs HEAD.
Index: patches/patch-io_h
===
RCS file: patches/patch-io_h
diff -N patches/patch-io_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-io_h 11 Aug 2017 23:13:27 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: io.h
+--- io.h.orig
io.h
+@@ -31,7 +31,7 @@
+ */
+
+ #define __OUT1(s,x) \
+-extern inline void __out##s(unsigned x value, unsigned short port) {
++static inline void __out##s(unsigned x value, unsigned short port) {
+
+ #define __OUT2(s,s1,s2) \
+ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
+@@ -43,7 +43,7 @@ __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" (value), "d"
+ __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO;
}
+
+ #define __IN1(s) \
+-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
++static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
+
+ #define __IN2(s,s1,s2) \
+ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
+@@ -55,7 +55,7 @@ __IN1(s##_p) __IN2(s,s1,"w") : "=a" (_v) : "d" (port)
+ __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO;
return _v; }
+
+ #define __OUTS(s) \
+-extern inline void outs##s(unsigned short port, const void * addr, unsigned
long count) \
++static inline void outs##s(unsigned short port, const void * addr, unsigned
long count) \
+ { __asm__ __volatile__ ("cld ; rep ; outs" #s \
+ : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+
Index: patches/patch-main_c
===
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-main_c11 Aug 2017 23:13:27 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: main.c
+--- main.c.orig
main.c
+@@ -111,6 +111,7 @@ static void __run_at(unsigned long addr)
+ /* Copy memtest86+ code */
+ memmove((void *)addr, &_start, _end - _start);
+ /* Jump to the start address */
++dummy:p = &&dummy;
+ p = (ulong *)(addr + startup_32 - _start);
+ goto *p;
+ }
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: FIX & UPDATE: games/tome4
Punting stupid problems along forever just gets worse and worse.
In a decade, what will this mess look like? It's so complicated
someone is going to break it in a different way.
> On Wed, Aug 09, 2017 at 04:21:34PM -0600, Theo de Raadt wrote:
> > That type of diff dissapoints me. Upstreams should be told to follow API,
> > rather than ABI.
>
> The real upstream of this uLong nonsense is zlib.net. They're not going
> to change it for me. And it wouldn't solve the issue of libpng linking
> against the wrong zlib.
>
> Here is a different approach, filtering out all clashing symbols.
>
> This seems to work great and is pretty unobtrusive, even if it's not all
> that elegant.
>
> Index: Makefile
> ===
> RCS file: /home/vcs/cvs/openbsd/ports/games/tome4/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile 31 May 2017 08:08:16 - 1.7
> +++ Makefile 11 Aug 2017 21:52:39 -
> @@ -5,7 +5,7 @@ COMMENT-data =data for Tales of Maj'Eya
>
> # '
>
> -V = 1.5.1
> +V = 1.5.5
> PKGNAME-main = tome4-${V}
> PKGNAME-data = tome4-data-${V}
> CATEGORIES = games x11
> @@ -42,6 +42,10 @@ WANTLIB-data =
> COMPILER = gcc
> COMPILER_LANGS = c
>
> +# Disable luajit support where broken and missing. See also lang/luajit
> +.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64"
> +CONFIGURE_ARGS += --lua=default
> +.endif
>
> NO_TEST =Yes
>
> @@ -57,7 +61,7 @@ do-configure:
> sed -i 's/gcc /${CC} /g' ${WRKSRC}/build/te4core.lua
> ${SUBST_CMD} ${WRKSRC}/src/getself.c
> ${SUBST_CMD} ${WRKSRC}/premake4.lua
> - @cd ${WRKSRC} ; premake4 gmake
> + cd ${WRKSRC} ; premake4 ${CONFIGURE_ARGS} gmake
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/t-engine ${PREFIX}/bin/tome4
> Index: distinfo
> ===
> RCS file: /home/vcs/cvs/openbsd/ports/games/tome4/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 27 Mar 2017 18:28:29 - 1.2
> +++ distinfo 11 Aug 2017 21:52:39 -
> @@ -1,2 +1,2 @@
> -SHA256 (t-engine4-src-1.5.1.tar.bz2) =
> er5VbR72iQ0WrlO4KSwQWSVDopR6QCS7mjtnARp00Lg=
> -SIZE (t-engine4-src-1.5.1.tar.bz2) = 421336208
> +SHA256 (t-engine4-src-1.5.5.tar.bz2) =
> A3zO5JMhPF4gdJ00gfVnbwUJlbtop7vYCu23fV17WGw=
> +SIZE (t-engine4-src-1.5.5.tar.bz2) = 421330688
> Index: patches/patch-build_exclude-zlib_ld
> ===
> RCS file: patches/patch-build_exclude-zlib_ld
> diff -N patches/patch-build_exclude-zlib_ld
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-build_exclude-zlib_ld 11 Aug 2017 21:52:39 -
> @@ -0,0 +1,28 @@
> +$OpenBSD$
> +
> +Fix black screen on 32bit archs because of zlib struct size mismatch
> affecting
> +libpng and SDL2.
> +
> +Hide libz symbols of newer copy provided with the game.
> +
> +
> +Index: build/exclude-zlib.ld
> +--- build/exclude-zlib.ld.orig
> build/exclude-zlib.ld
> +@@ -0,0 +1,16 @@
> ++TOME {
> ++local:
> ++adler32; adler32_combine; compress; compress2; compressBound;
> ++crc32; crc32_combine; deflate; deflateBound; deflateCopy;
> ++deflateEnd; deflateInit2_; deflateInit_; deflateParams;
> ++deflatePrime; deflateReset; deflateSetDictionary;
> ++deflateSetHeader; deflateTune; get_crc_table; gzclearerr;
> ++gzclose; gzdirect; gzdopen; gzeof; gzerror; gzflush; gzgetc;
> ++gzgets; gzopen; gzprintf; gzputc; gzputs; gzread; gzrewind;
> ++gzseek; gzsetparams; gztell; gzungetc; gzwrite; inflate;
> ++inflateBack; inflateBackEnd; inflateBackInit_; inflateCopy;
> ++inflateEnd; inflateGetHeader; inflateInit2_; inflateInit_;
> ++inflatePrime; inflateReset; inflateSetDictionary; inflateSync;
> ++inflateSyncPoint; inflate_fast; inflate_table; uncompress;
> ++zError; zcalloc; zcfree; zlibCompileFlags; zlibVersion;
> ++};
> Index: patches/patch-build_te4core_lua
> ===
> RCS file:
> /home/vcs/cvs/openbsd/ports/games/tome4/patches/patch-build_te4core_lua,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-build_te4core_lua
> --- patches/patch-build_te4core_lua 28 Dec 2016 18:34:57 - 1.1.1.1
> +++ patches/patch-build_te4core_lua 11 Aug 2017 21:52:39 -
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-build_te4core_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
> build/te4core.lua.orig Fri Dec 2 11:29:13 2016
> -+++ build/te4core.luaFri Dec 2 11:29:23 2016
> +Index: build/te4core.lua
> +--- build/te4core.lua.orig
> build/te4core.lua
> @@ -40,7 +40,7 @@ project "TEngine"
> links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket",
> "luaprofiler", "lpeg", "tcodimport", "lxp", "
Re: FIX & UPDATE: games/tome4
On Wed, Aug 09, 2017 at 04:21:34PM -0600, Theo de Raadt wrote:
> That type of diff dissapoints me. Upstreams should be told to follow API,
> rather than ABI.
The real upstream of this uLong nonsense is zlib.net. They're not going
to change it for me. And it wouldn't solve the issue of libpng linking
against the wrong zlib.
Here is a different approach, filtering out all clashing symbols.
This seems to work great and is pretty unobtrusive, even if it's not all
that elegant.
Index: Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/games/tome4/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile31 May 2017 08:08:16 - 1.7
+++ Makefile11 Aug 2017 21:52:39 -
@@ -5,7 +5,7 @@ COMMENT-data = data for Tales of Maj'Eya
# '
-V =1.5.1
+V =1.5.5
PKGNAME-main = tome4-${V}
PKGNAME-data = tome4-data-${V}
CATEGORIES = games x11
@@ -42,6 +42,10 @@ WANTLIB-data =
COMPILER = gcc
COMPILER_LANGS = c
+# Disable luajit support where broken and missing. See also lang/luajit
+.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64"
+CONFIGURE_ARGS += --lua=default
+.endif
NO_TEST = Yes
@@ -57,7 +61,7 @@ do-configure:
sed -i 's/gcc /${CC} /g' ${WRKSRC}/build/te4core.lua
${SUBST_CMD} ${WRKSRC}/src/getself.c
${SUBST_CMD} ${WRKSRC}/premake4.lua
- @cd ${WRKSRC} ; premake4 gmake
+ cd ${WRKSRC} ; premake4 ${CONFIGURE_ARGS} gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/t-engine ${PREFIX}/bin/tome4
Index: distinfo
===
RCS file: /home/vcs/cvs/openbsd/ports/games/tome4/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Mar 2017 18:28:29 - 1.2
+++ distinfo11 Aug 2017 21:52:39 -
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.5.1.tar.bz2) =
er5VbR72iQ0WrlO4KSwQWSVDopR6QCS7mjtnARp00Lg=
-SIZE (t-engine4-src-1.5.1.tar.bz2) = 421336208
+SHA256 (t-engine4-src-1.5.5.tar.bz2) =
A3zO5JMhPF4gdJ00gfVnbwUJlbtop7vYCu23fV17WGw=
+SIZE (t-engine4-src-1.5.5.tar.bz2) = 421330688
Index: patches/patch-build_exclude-zlib_ld
===
RCS file: patches/patch-build_exclude-zlib_ld
diff -N patches/patch-build_exclude-zlib_ld
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-build_exclude-zlib_ld 11 Aug 2017 21:52:39 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Fix black screen on 32bit archs because of zlib struct size mismatch affecting
+libpng and SDL2.
+
+Hide libz symbols of newer copy provided with the game.
+
+
+Index: build/exclude-zlib.ld
+--- build/exclude-zlib.ld.orig
build/exclude-zlib.ld
+@@ -0,0 +1,16 @@
++TOME {
++ local:
++ adler32; adler32_combine; compress; compress2; compressBound;
++ crc32; crc32_combine; deflate; deflateBound; deflateCopy;
++ deflateEnd; deflateInit2_; deflateInit_; deflateParams;
++ deflatePrime; deflateReset; deflateSetDictionary;
++ deflateSetHeader; deflateTune; get_crc_table; gzclearerr;
++ gzclose; gzdirect; gzdopen; gzeof; gzerror; gzflush; gzgetc;
++ gzgets; gzopen; gzprintf; gzputc; gzputs; gzread; gzrewind;
++ gzseek; gzsetparams; gztell; gzungetc; gzwrite; inflate;
++ inflateBack; inflateBackEnd; inflateBackInit_; inflateCopy;
++ inflateEnd; inflateGetHeader; inflateInit2_; inflateInit_;
++ inflatePrime; inflateReset; inflateSetDictionary; inflateSync;
++ inflateSyncPoint; inflate_fast; inflate_table; uncompress;
++ zError; zcalloc; zcfree; zlibCompileFlags; zlibVersion;
++};
Index: patches/patch-build_te4core_lua
===
RCS file:
/home/vcs/cvs/openbsd/ports/games/tome4/patches/patch-build_te4core_lua,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_te4core_lua
--- patches/patch-build_te4core_lua 28 Dec 2016 18:34:57 - 1.1.1.1
+++ patches/patch-build_te4core_lua 11 Aug 2017 21:52:39 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-build_te4core_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
build/te4core.lua.orig Fri Dec 2 11:29:13 2016
-+++ build/te4core.lua Fri Dec 2 11:29:23 2016
+Index: build/te4core.lua
+--- build/te4core.lua.orig
build/te4core.lua
@@ -40,7 +40,7 @@ project "TEngine"
links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket",
"luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib",
"luabitop", "te4-bzip" }
defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
@@ -10,3 +11,11 @@ $OpenBSD: patch-build_te4core_lua,v 1.1.
if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath
-Wl,\\\$\$ORIGIN/lib "} end
if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath
-Wl,\\\$\$ORIGIN/
Re: clang breakage: memtest86+
On Fri, Aug 11, 2017 at 05:29:23PM -0400, Jeremie Courreges-Anglas wrote:
> On Fri, Aug 11 2017, Jeremie Courreges-Anglas wrote:
> > On Fri, Aug 11 2017, Christian Weisgerber wrote:
> >> On 2017-08-10, Jeremie Courreges-Anglas wrote:
> >>
> >>> +# XXX base gcc
> >>> +CC= /usr/bin/gcc
> >
> > Thanks for the test reports, which confirm that I'm the only one unable
> > to run memtest86+ on my machines...
> >
> >> That isn't a solution.
> >
> > It is a solution, just not a long-term one. ;)
> >
> > So here's a diff I just cooked up (I don't know where I've put the
> > previous version...). While here, respect CC. Note that as(1) is still
> > used once, which could be a problem on a clang-only box.
> >
> > Tests welcome.
>
> So with this diff memtest86+ doesn't work any more on naddy's x230
> (it did with /usr/bin/gcc). Using gcc from ports doesn't help.
>
I was trying just now to take a look at why it fails (since I also have
an x230) but it doesn't even build for me with clang at all:
cc -c -O2 -pipe -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC -fno-stack-protector -fno-pie -fno-strict-aliasing reloc.c
reloc.c:50:10: warning: variable 'got' is uninitialized when used here
[-Wuninitialized]
return *got;
^~~
reloc.c:49:26: note: initialize the variable 'got' to silence this warning
register Elf32_Addr *got asm ("%ebx");
^
= NULL
1 warning generated.
cc -O2 -pipe -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC -fno-stack-protector -fno-pie -c -o main.o main.c
main.c:115:7: warning: passing 'volatile ulong *' (aka 'volatile unsigned long
*') to parameter of type 'const void *' discards qualifiers
[-Wincompatible-pointer-types-discards-qualifiers]
goto *p;
^~
main.c:115:2: error: indirect goto in function with no address-of-label
expressions
goto *p;
^
1 warning and 1 error generated.
gmake: *** [: main.o] Error 1
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/memtest86+-4.20/.build_done')
*** Error 1 in /usr/ports/sysutils/memtest86+
(/usr/ports/infrastructure/mk/bsd.port.mk:2408 'all')
If someone can give me a clue why, I can see if I can debug it further.
-ml
> We have several options:
> - mark it broken
> - force the use of /usr/bin/gcc, which obviously work work any more when
> we unlink gcc on i386/amd64.
> - build a binary snapshot with /usr/bin/gcc and then just use that
> binary snapshot as a distfile. After all, these are standalone
> programs.
>
> Marking it BROKEN would be a shame, memtest86+ is a useful tool. As
> discussed with naddy I don't know yet which solution we'll choose in the
> end, opinions welcome.
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
Re: clang breakage: memtest86+
On Fri, 11 Aug 2017 17:29:23 -0400, Jeremie Courreges-Anglas wrote: > So with this diff memtest86+ doesn't work any more on naddy's x230 > (it did with /usr/bin/gcc). Using gcc from ports doesn't help. Have you tried building it without optimization? - todd
clang/amd64 fallout (2017-08-10)
Here's the list of ports still broken on amd64 due to the clang switch: audio/festival/core devel/glog devel/mico devel/stp devel/ti-msp430gcc editors/TeXmacs emulators/emulationstation games/frozen-bubble games/vacuum graphics/simgear multimedia/avidemux security/encfs sysutils/memtest86+ Build logs at http://build-failures.rhaalovely.net/amd64/2017-08-10/ (There are also logs for a few additional build failures there, unrelated to clang.) -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: clang breakage: memtest86+
On Fri, Aug 11 2017, Jeremie Courreges-Anglas wrote: > On Fri, Aug 11 2017, Christian Weisgerber wrote: >> On 2017-08-10, Jeremie Courreges-Anglas wrote: >> >>> +# XXX base gcc >>> +CC=/usr/bin/gcc > > Thanks for the test reports, which confirm that I'm the only one unable > to run memtest86+ on my machines... > >> That isn't a solution. > > It is a solution, just not a long-term one. ;) > > So here's a diff I just cooked up (I don't know where I've put the > previous version...). While here, respect CC. Note that as(1) is still > used once, which could be a problem on a clang-only box. > > Tests welcome. So with this diff memtest86+ doesn't work any more on naddy's x230 (it did with /usr/bin/gcc). Using gcc from ports doesn't help. We have several options: - mark it broken - force the use of /usr/bin/gcc, which obviously work work any more when we unlink gcc on i386/amd64. - build a binary snapshot with /usr/bin/gcc and then just use that binary snapshot as a distfile. After all, these are standalone programs. Marking it BROKEN would be a shame, memtest86+ is a useful tool. As discussed with naddy I don't know yet which solution we'll choose in the end, opinions welcome. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[UPDATE] Tor Browser 7.0.4
Hi ports@,
We skipped 7.0.3 because it was Linux-only, but 7.0.4 is for everyone.
Attached is an update, which also fixes the issue of the bookmarks
toolbar looking like normal Firefox ESR's default instead of Tor
Browser (kudos to Mike Kaply for knowing *everything* about packaging
Mozilla and sharing it on his blog). It also incorporates changes
suggested by landry@ and sthen@ during the 7.0.2 update discussion.
We (George and I) have also been testing the recently-posted
net/obfs4proxy ports in conjunction with this release, with good
results: you can connect to Tor using obfs4 bridges by adding a line
or two to your ~/TorBrowser-Data/Data/torrc now. If/when
net/obfs4proxy gets accepted I'll add an r-dep to meta/tor-browser and
we're that much closer to having full TBB functionality.
Feedback most welcome. Patch attached.
Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D 09C1 4068 D5D5 62A7 29CF
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- meta/tor-browser/Makefile 26 Jul 2017 20:50:39 - 1.7
+++ meta/tor-browser/Makefile 11 Aug 2017 20:33:42 -
@@ -4,7 +4,7 @@ COMMENT= Tor Browser meta package
MAINTAINER= Sean Levy
-PKGNAME= tor-browser-7.0.2
+PKGNAME= tor-browser-7.0.4
RUN_DEPENDS= www/tor-browser/browser \
www/tor-browser/torbutton \
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- meta/tor-browser/pkg/README 26 Jul 2017 20:50:39 - 1.2
+++ meta/tor-browser/pkg/README 11 Aug 2017 20:33:42 -
@@ -11,11 +11,11 @@ To start Tor Browser:
This will create a ~/TorBrowser-Data directory tree if it does not
exist.
-As of the 7.0.2 release Tor Browser keeps its data in ~/TorBrowser-Data/Data.
-In 6.5.2 it was ~/TorBrowser-Data/Browser. If you wish to preserve either
-your tor configuration (bridges, etc) or your browser profile across
-the updated to 7.0.2 please do the following BEFORE starting tor-browser
-after you upgrade:
+As of the 7.0.2 release Tor Browser keeps its data in
+~/TorBrowser-Data/Data. In 6.5.2 it was ~/TorBrowser-Data/Browser.
+If you wish to preserve either your tor configuration (bridges, etc)
+or your browser profile and are updating from a version before 7.0.2
+please do the following BEFORE starting tor-browser after you upgrade:
$ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- www/tor-browser/Makefile.inc 26 Jul 2017 20:50:39 - 1.8
+++ www/tor-browser/Makefile.inc 11 Aug 2017 20:33:42 -
@@ -7,7 +7,7 @@ PERMIT_PACKAGE_CDROM ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
# XXX If updating, bump REVISION of any extensions which did not get updated.
-TB_VERSION = 7.0.2
+TB_VERSION = 7.0.4
TB_PREFIX = tb
SUBST_VARS += BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/tor-browser/browser/Makefile 9 Aug 2017 06:24:26 - 1.15
+++ www/tor-browser/browser/Makefile 11 Aug 2017 20:33:42 -
@@ -18,11 +18,10 @@ WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH
PATCHORIG = .pat.orig
GH_PROJECT = torb
-GH_TAGNAME = v${TB_VERSION}-esr52.2.0
+GH_TAGNAME = v${TB_VERSION}-esr52.3.0
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
DISTNAME = ${GH_TAGNAME}
-REVISION = 1
SO_VERSION = 2.0
MOZILLA_LIBS = xul lgpllibs mozavcodec mozavutil
@@ -44,7 +43,7 @@ MOZILLA_USE_BUNDLED_NSS = Yes
MOZILLA_USE_BUNDLED_LIBEVENT = Yes
MOZILLA_USE_BUNDLED_SQLITE = Yes
-WANTLIB += X11-xcb xcb xcb-shm intl iconv ${LIBECXX}
+WANTLIB += X11-xcb xcb xcb-shm intl ${LIBECXX}
LIB_DEPENDS += devel/gettext
@@ -61,19 +60,11 @@ MAKE_ENV += BUILD_OPT=1 \
XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
BUILD_DEPENDS += devel/py-virtualenv
-# to be able to link when building with clang on i386
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS += --disable-debug-symbols
-.endif
-
CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \
--with-tor-browser-version=${TB_VERSION} \
--disable-tor-browser-update
-# relies on pulseaudio for sound and broken at runtime
-#CONFIGURE_ARGS += --disable-webrtc
-
-RUN_DEPENDS += net/tor>=0.3.0.9
+RUN_DEPENDS += net/tor>=0.3.0.10
# bug 857628
CONFIGURE_ARGS += --enable-pie
@@ -82,11 +73,9 @@ post-patch:
# hack config/baseconfig.mk to not use MOZ_APP_VERSION in a few places
sed -i.bak -e 's/-$$(MOZ_APP
Re: 6.1-stable amd64 lang/python/2.7
Hello Ingo Now I'm going more into generic bikeshed discussions. I wasn't recommending change to /usr/xenocara just using the paragraph title for reference. Prior to the automatic partition setup in the installer I did used to create a /usr/ports partition, but stopped doing it when the installer asked if I wanted to use the partition table with automatic defaults. I assume the installer is trying to create "sane" defaults, if so should not a /usr/ports partition also be created. I believe it is a false assumption to believe /usr/ports and /usr/xenocara as part of /usr filesystem is unusual. Anyway, this discussion is way beyond Python 2.7 build issue, I'll leave it alone. g.day diana On Fri, 11 Aug 2017, Ingo Schwarze wrote: Hi Diana, Diana Eichert wrote on Wed, Aug 09, 2017 at 11:33:45AM -0600: Also I installed /usr/ports using the directions I've been using for years, http://www.openbsd.org/anoncvs.html . Perhaps a change should be made to the "Getting the ports and xenocara trees" area recommending the use of a separate partition for ports and ports build space. I don't think that would be the right place to mention it. Having /usr/ports and /usr/xenocara as part of the /usr filesystem is probably unusual, but i can't see anything seriously wrong with it. Only /usr/ports/pobj needs a dedicated file system, and you can easily do that after checking out the ports tree, even much later once you run into the problem. Yours, Ingo
Re: clang breakage: memtest86+
On Fri, Aug 11 2017, Christian Weisgerber wrote:
> On 2017-08-10, Jeremie Courreges-Anglas wrote:
>
>> +# XXX base gcc
>> +CC= /usr/bin/gcc
Thanks for the test reports, which confirm that I'm the only one unable
to run memtest86+ on my machines...
> That isn't a solution.
It is a solution, just not a long-term one. ;)
So here's a diff I just cooked up (I don't know where I've put the
previous version...). While here, respect CC. Note that as(1) is still
used once, which could be a problem on a clang-only box.
Tests welcome.
Index: Makefile
===
RCS file: /d/cvs/ports/sysutils/memtest86+/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile4 Feb 2014 10:14:52 - 1.10
+++ Makefile11 Aug 2017 20:07:02 -
@@ -19,7 +19,7 @@ MASTER_SITES= ${HOMEPAGE}/download/${VE
USE_GMAKE= Yes
NO_TEST= Yes
-MAKE_ENV= V=${VERSION}
+MAKE_ENV= CC="${CC}" V=${VERSION}
post-build:
@cd ${WRKBUILD} && sh ${WRKDIST}/makeiso.sh
Index: patches/patch-Makefile
===
RCS file: /d/cvs/ports/sysutils/memtest86+/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile
--- patches/patch-Makefile 31 Mar 2015 18:29:51 - 1.6
+++ patches/patch-Makefile 11 Aug 2017 20:15:20 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.6 2015/03/31 18:29:51 pascal Exp $
$RuOBSD: patch-Makefile,v 1.3 2009/02/07 10:28:03 form Exp $
Makefile.orig Sun Jan 23 19:11:04 2011
-+++ Makefile Tue Mar 31 17:06:38 2015
+Index: Makefile
+--- Makefile.orig
Makefile
@@ -6,33 +6,47 @@
#
# Path for the floppy disk device
@@ -72,7 +73,7 @@ $RuOBSD: patch-Makefile,v 1.3 2009/02/07
test.o: test.c
- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin
-ffreestanding test.c
-+ $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin
-ffreestanding -fno-pie test.c
++ $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin
-ffreestanding -fno-stack-protector -fno-pie test.c
clean:
rm -f *.o *.s *.iso memtest.bin memtest memtest_shared
memtest_shared.bin
Index: patches/patch-io_h
===
RCS file: patches/patch-io_h
diff -N patches/patch-io_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-io_h 11 Aug 2017 20:17:26 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+
+Simple fix to avoid multiple definitions error.
+
+Index: io.h
+--- io.h.orig
io.h
+@@ -31,7 +31,7 @@
+ */
+
+ #define __OUT1(s,x) \
+-extern inline void __out##s(unsigned x value, unsigned short port) {
++static inline void __out##s(unsigned x value, unsigned short port) {
+
+ #define __OUT2(s,s1,s2) \
+ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
+@@ -43,7 +43,7 @@ __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" (value), "d"
+ __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO;
}
+
+ #define __IN1(s) \
+-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
++static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
+
+ #define __IN2(s,s1,s2) \
+ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
+@@ -55,7 +55,7 @@ __IN1(s##_p) __IN2(s,s1,"w") : "=a" (_v) : "d" (port)
+ __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO;
return _v; }
+
+ #define __OUTS(s) \
+-extern inline void outs##s(unsigned short port, const void * addr, unsigned
long count) \
++static inline void outs##s(unsigned short port, const void * addr, unsigned
long count) \
+ { __asm__ __volatile__ ("cld ; rep ; outs" #s \
+ : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+
Index: patches/patch-main_c
===
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-main_c11 Aug 2017 20:05:21 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Unsupported with clang:
+
+ main.c:115:2: error: indirect goto in function with no address-of-label
expressions
+
+Index: main.c
+--- main.c.orig
main.c
+@@ -112,7 +112,9 @@ static void __run_at(unsigned long addr)
+ memmove((void *)addr, &_start, _end - _start);
+ /* Jump to the start address */
+ p = (ulong *)(addr + startup_32 - _start);
+- goto *p;
++
++ void (* volatile f)(void);
++ f = (void (* volatile)(void)) p;
+ }
+
+ static unsigned long run_at_addr = 0x;
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: 6.1-stable amd64 lang/python/2.7
Hi Diana, Diana Eichert wrote on Wed, Aug 09, 2017 at 11:33:45AM -0600: > Also I installed /usr/ports using the directions I've been using > for years, http://www.openbsd.org/anoncvs.html . Perhaps a change > should be made to the "Getting the ports and xenocara trees" area > recommending the use of a separate partition for ports and ports > build space. I don't think that would be the right place to mention it. Having /usr/ports and /usr/xenocara as part of the /usr filesystem is probably unusual, but i can't see anything seriously wrong with it. Only /usr/ports/pobj needs a dedicated file system, and you can easily do that after checking out the ports tree, even much later once you run into the problem. Yours, Ingo
Update to haproxy-1.7.8
Hi,
Here's a diff to move haproxy from the oldstable branch to stable
branch. I didn't succeed before because the libressl stuff but
trueos/hbsd did the job so I just stole their diff.
Comments? OK?
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile20 Jun 2017 17:38:40 - 1.42
+++ Makefile11 Aug 2017 16:09:12 -
@@ -2,7 +2,7 @@
COMMENT = reliable, high performance TCP/HTTP load balancer
-DISTNAME = haproxy-1.6.13
+DISTNAME = haproxy-1.7.8
CATEGORIES = net www
HOMEPAGE = http://www.haproxy.org/
MAINTAINER = Daniel Jakots
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM =Yes
WANTLIB = c crypto pcre pcreposix ssl
-MASTER_SITES = ${HOMEPAGE}/download/1.6/src/
+MASTER_SITES = ${HOMEPAGE}/download/1.7/src/
HAPROXYCONF = ${SYSCONFDIR}/haproxy
HAPROXYSTATE = /var/haproxy
Index: distinfo
===
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo20 Jun 2017 17:38:40 - 1.25
+++ distinfo11 Aug 2017 16:09:12 -
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.6.13.tar.gz) = fTGFg/OhvxhehXvUBEkASynJVUfIm7s2cY8oTilQKhs=
-SIZE (haproxy-1.6.13.tar.gz) = 1580214
+SHA256 (haproxy-1.7.8.tar.gz) = 7JAVPM7dIK1AFdPq92tQL/H2G0MdVMIrhFe1eEqa4UI=
+SIZE (haproxy-1.7.8.tar.gz) = 1746321
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 20 Jun 2017 17:38:40 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.6 2017/06/20 17:38:40 danj Exp $
-
-Make use of accept4() on OpenBSD.
-
-Committed upstream
-http://git.haproxy.org/?p=haproxy.git;a=commit;h=9705ba2981016dd6b3b8d690bb8935a396cc0994
-
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -306,10 +306,11 @@ ifeq ($(TARGET),osx)
- USE_TPROXY = implicit
- else
- ifeq ($(TARGET),openbsd)
-- # This is for OpenBSD >= 3.0
-+ # This is for OpenBSD >= 5.7
- USE_POLL = implicit
- USE_KQUEUE = implicit
- USE_TPROXY = implicit
-+ USE_ACCEPT4= implicit
- else
- ifeq ($(TARGET),netbsd)
- # This is for NetBSD
Index: patches/patch-doc_haproxy_1
===
RCS file: /cvs/ports/net/haproxy/patches/patch-doc_haproxy_1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-doc_haproxy_1
--- patches/patch-doc_haproxy_1 11 Sep 2014 14:47:20 - 1.3
+++ patches/patch-doc_haproxy_1 11 Aug 2017 16:09:12 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-doc_haproxy_1,v 1.3 2014/09/11 14:47:20 gonzalo Exp $
doc/haproxy.1.orig Fri Jul 25 03:56:07 2014
-+++ doc/haproxy.1 Thu Sep 4 12:12:46 2014
-@@ -188,8 +188,7 @@ This signal is intercepted and ignored on systems with
+Index: doc/haproxy.1
+--- doc/haproxy.1.orig
doc/haproxy.1
+@@ -190,8 +190,7 @@ This signal is intercepted and ignored on systems with
.SH SEE ALSO
Index: patches/patch-src_ssl_sock_c
===
RCS file: /cvs/ports/net/haproxy/patches/patch-src_ssl_sock_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_ssl_sock_c
--- patches/patch-src_ssl_sock_c1 Feb 2017 15:49:34 - 1.6
+++ patches/patch-src_ssl_sock_c11 Aug 2017 16:09:12 -
@@ -1,21 +1,51 @@
$OpenBSD: patch-src_ssl_sock_c,v 1.6 2017/02/01 15:49:34 naddy Exp $
src/ssl_sock.c.origSun Dec 25 09:26:16 2016
-+++ src/ssl_sock.c Thu Jan 26 21:09:45 2017
-@@ -2810,7 +2810,7 @@ int ssl_sock_handshake(struct connection *conn, unsign
- if (!errno && conn->flags & CO_FL_WAIT_L4_CONN)
- conn->flags &= ~CO_FL_WAIT_L4_CONN;
- if (!conn->err_code) {
-- if (!((SSL
*)conn->xprt_ctx)->packet_length) {
-+ if (SSL_state((SSL *)conn->xprt_ctx) ==
SSL_ST_BEFORE) {
- if (!errno) {
- if (conn->xprt_st &
SSL_SOCK_RECV_HEARTBEAT)
- conn->err_code
= CO_ER_SSL_HANDSHAKE_HB;
-@@ -2877,7 +2877,7 @@ int ssl_sock_handshake(struct connection *conn, unsign
- if (!errno && conn->flags & CO_FL_WAIT_L4_CONN)
- conn->flags &= ~CO_FL_WAIT_L4_CONN;
+
+From
+https://github.com/trueos/freebsd-ports/blob/3745ead2e0f43985c3647e1e3aecae2751decfda/net/haproxy/files/patch-src_ssl__sock.c
+
+Index: src/ssl_sock.c
+--- src/ssl_sock.c.orig
src/ssl_sock.c
+@@ -794,8 +794,11 @@ static int ssl_sock_load_o
Re: mail/courier-* update
On 2017/08/11 17:52, Giovanni Bechis wrote: > On 08/11/17 17:45, Giovanni Bechis wrote: > > On 08/11/17 13:21, Stuart Henderson wrote: > >> On 2017/07/26 15:42, Giovanni Bechis wrote: > >>> Hi, > >>> update to courier stuff, is it ok with COMPILER additions (c++11 needed) ? > >>> Cheers > >>> Giovanni > >> > >> courier-authlib failed in bulk: > >> > >> gmake[3]: Entering directory > >> '/usr/obj/ports/courier-authlib-0.68.0/courier-authlib-0.68.0/libs/rfc822' > >> /usr/bin/libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. > >> -I/usr/local/include -I/usr/local/include -O2 -pipe -Wall -I.. -I./.. -MT > >> rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c -o rfc2047u.lo rfc2047u.c > >> cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include -O2 -pipe > >> -Wall -I.. -I./.. -MT rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c > >> rfc2047u.c -fPIC -DPIC -o .libs/rfc2047u.o > >> rfc2047u.c:18:10: fatal error: 'idna.h' file not found > >> #include > >> ^~~~ > >> 1 error generated. > >> > > missing dependency, I will commit it next week is faster. > > Cheers > >Giovanni > > > err, I will commit it next week, please commit if you are faster. > Giovanni I wonder why it's not dynamically linked..
Re: mail/courier-* update
On 08/11/17 17:45, Giovanni Bechis wrote: > On 08/11/17 13:21, Stuart Henderson wrote: >> On 2017/07/26 15:42, Giovanni Bechis wrote: >>> Hi, >>> update to courier stuff, is it ok with COMPILER additions (c++11 needed) ? >>> Cheers >>> Giovanni >> >> courier-authlib failed in bulk: >> >> gmake[3]: Entering directory >> '/usr/obj/ports/courier-authlib-0.68.0/courier-authlib-0.68.0/libs/rfc822' >> /usr/bin/libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. >> -I/usr/local/include -I/usr/local/include -O2 -pipe -Wall -I.. -I./.. -MT >> rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c -o rfc2047u.lo rfc2047u.c >> cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include -O2 -pipe >> -Wall -I.. -I./.. -MT rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c >> rfc2047u.c -fPIC -DPIC -o .libs/rfc2047u.o >> rfc2047u.c:18:10: fatal error: 'idna.h' file not found >> #include >> ^~~~ >> 1 error generated. >> > missing dependency, I will commit it next week is faster. > Cheers >Giovanni > err, I will commit it next week, please commit if you are faster. Giovanni
Re: mail/courier-* update
On 08/11/17 13:21, Stuart Henderson wrote:
> On 2017/07/26 15:42, Giovanni Bechis wrote:
>> Hi,
>> update to courier stuff, is it ok with COMPILER additions (c++11 needed) ?
>> Cheers
>> Giovanni
>
> courier-authlib failed in bulk:
>
> gmake[3]: Entering directory
> '/usr/obj/ports/courier-authlib-0.68.0/courier-authlib-0.68.0/libs/rfc822'
> /usr/bin/libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I.
> -I/usr/local/include -I/usr/local/include -O2 -pipe -Wall -I.. -I./.. -MT
> rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c -o rfc2047u.lo rfc2047u.c
> cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include -O2 -pipe
> -Wall -I.. -I./.. -MT rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c
> rfc2047u.c -fPIC -DPIC -o .libs/rfc2047u.o
> rfc2047u.c:18:10: fatal error: 'idna.h' file not found
> #include
> ^~~~
> 1 error generated.
>
missing dependency, I will commit it next week is faster.
Cheers
Giovanni
Index: Makefile
===
RCS file: /var/cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile 9 Aug 2017 20:36:40 - 1.65
+++ Makefile 11 Aug 2017 15:42:38 -
@@ -68,7 +68,8 @@ CONFIGURE_ARGS+= --enable-static \
--cache-file=${WRKDIR}/courier-authlib.cache
RUN_DEPENDS-main= lang/expect
-BUILD_DEPENDS= lang/expect \
+BUILD_DEPENDS= devel/libidn \
+ lang/expect \
mail/courier-unicode>=2.0
DOCS= COPYING COPYING.GPL INSTALL NEWS README
Re: clang breakage: memtest86+
On 2017-08-10, Jeremie Courreges-Anglas wrote: > +# XXX base gcc > +CC= /usr/bin/gcc That isn't a solution. -- Christian "naddy" Weisgerber na...@mips.inka.de
Update to weechat-1.9
Hi,
Here's an update to latest weechat release. Change log for 1.8 and 1.9
is available at https://weechat.org/files/changelog/ChangeLog-1.9.html
Tests, comments and ok are welcomed :)
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile23 Apr 2017 14:33:50 - 1.29
+++ Makefile11 Aug 2017 14:58:37 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 1.7.1
+V= 1.9
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -70,8 +70,6 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DENABLE_PYTHON=yes \
-DENABLE_JAVASCRIPT=no \
-DHAVE_BACKTRACE=no \
- -DMANDIR=${PREFIX}/man \
- -DENABLE_MAN=on \
-DCA_FILE=/etc/ssl/cert.pem \
-DTCL_TCLSH=${MODTCL_BIN} \
-DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
@@ -85,7 +83,7 @@ pre-configure:
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
$(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.adoc \
- ${PREFIX}/share/doc/weechat/
+ ${PREFIX}/share/doc/weechat/
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo23 Apr 2017 14:33:50 - 1.13
+++ distinfo11 Aug 2017 14:58:37 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-1.7.1.tar.gz) = UE6f10Jol8WaPdD7Zyj75rXy7nU9utNg4zJ5NFcaco8=
-SIZE (weechat-1.7.1.tar.gz) = 3650630
+SHA256 (weechat-1.9.tar.gz) = vI4KuFZjOQSR3x1PcUiXKXv8zYnpPPtxnySvwXzNKpc=
+SIZE (weechat-1.9.tar.gz) = 3749097
Index: patches/patch-src_plugins_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_plugins_CMakeLists_txt
--- patches/patch-src_plugins_CMakeLists_txt23 Mar 2017 01:46:23 -
1.3
+++ patches/patch-src_plugins_CMakeLists_txt11 Aug 2017 14:58:37 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_plugins_CMakeLists_txt,v 1.3 2017/03/23 01:46:23 danj Exp $
src/plugins/CMakeLists.txt.origSun Jan 15 01:41:25 2017
-+++ src/plugins/CMakeLists.txt Sun Mar 12 19:58:13 2017
-@@ -106,8 +106,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
+Index: src/plugins/CMakeLists.txt
+--- src/plugins/CMakeLists.txt.orig
src/plugins/CMakeLists.txt
+@@ -110,8 +110,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
endif()
if(ENABLE_SCRIPTS AND ENABLE_PYTHON)
Index: patches/patch-src_plugins_plugin-api_c
===
RCS file: patches/patch-src_plugins_plugin-api_c
diff -N patches/patch-src_plugins_plugin-api_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_plugin-api_c 11 Aug 2017 14:58:37 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Our time_t is 64 bits
+
+Index: src/plugins/plugin-api.c
+--- src/plugins/plugin-api.c.orig
src/plugins/plugin-api.c
+@@ -880,7 +880,7 @@ plugin_api_info_uptime_cb (const void *pointer, void *
+ {
+ /* return the number of seconds */
+ util_get_uptime (&total_seconds, NULL, NULL, NULL, NULL);
+-snprintf (value, sizeof (value), "%ld", total_seconds);
++snprintf (value, sizeof (value), "%lld", (long long)total_seconds);
+ return value;
+ }
+
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 23 Mar 2017 01:46:23 - 1.7
+++ pkg/PLIST-main 11 Aug 2017 14:58:37 -
@@ -7,6 +7,7 @@ lib/pkgconfig/weechat.pc
lib/weechat/
lib/weechat/plugins/
lib/weechat/plugins/alias.so
+lib/weechat/plugins/buflist.so
lib/weechat/plugins/charset.so
lib/weechat/plugins/exec.so
lib/weechat/plugins/fifo.so
Re: UPDATE: SMPlayer-17.8.0
On Fri, Aug 11, 2017 at 11:29:46AM -0300, Gonzalo L. Rodriguez wrote: > Sorry, it runs NetBSD. xD > > Diff attached. Tested on amd64. No issues.
Re: UPDATE: SMPlayer-17.8.0
Sorry, it runs NetBSD. xD Diff attached. On [11/08/17] [04:58P], Paul Irofti wrote: ; Your toaster forgot to attach the diff. ; ; On Fri, Aug 11, 2017 at 10:38:20AM -0300, Gonzalo L. Rodriguez wrote: ; > Hello, ; > ; > Small update for SMPlayer to 17.8.0: ; > ; > http://www.smplayer.info/en/changes ; > ; > Ok? Comments? ; > ; > Cheers.- ; > -- ; > Sending from my toaster. ; -- Sending from my toaster. Index: Makefile === RCS file: /cvs/ports/x11/smplayer/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- Makefile2 Aug 2017 14:35:06 - 1.38 +++ Makefile11 Aug 2017 03:46:35 - @@ -2,7 +2,7 @@ COMMENT = complete front-end for MPlayer -DISTNAME = smplayer-17.7.0 +DISTNAME = smplayer-17.8.0 CATEGORIES = multimedia x11 Index: distinfo === RCS file: /cvs/ports/x11/smplayer/distinfo,v retrieving revision 1.25 diff -u -p -r1.25 distinfo --- distinfo2 Aug 2017 14:35:06 - 1.25 +++ distinfo11 Aug 2017 03:46:35 - @@ -1,2 +1,2 @@ -SHA256 (smplayer-17.7.0.tar.bz2) = k6feMxty7ObxPmoUiOTjlYovlgr6/RWb5G0JjTuCZbw= -SIZE (smplayer-17.7.0.tar.bz2) = 5048417 +SHA256 (smplayer-17.8.0.tar.bz2) = cHkOvbkbJbQpMhKYfGQihYGcj87Uur8d6lSybY/7p2o= +SIZE (smplayer-17.8.0.tar.bz2) = 5054096
Re: NEW: converters/k2pdfopt
On Fri, Aug 11, 2017 at 12:40:13PM +0100, Stuart Henderson wrote: > one of the patches has ^M in, that's going to break at some point or > at least make emailed diffs not work very well - I would recommend > a post-extract that does "perl -i -pe 's/\r$$//' $file" Fixed. k2pdfopt.tgz Description: application/tar-gz
Re: UPDATE: SMPlayer-17.8.0
Your toaster forgot to attach the diff. On Fri, Aug 11, 2017 at 10:38:20AM -0300, Gonzalo L. Rodriguez wrote: > Hello, > > Small update for SMPlayer to 17.8.0: > > http://www.smplayer.info/en/changes > > Ok? Comments? > > Cheers.- > -- > Sending from my toaster.
UPDATE: SMPlayer-17.8.0
Hello, Small update for SMPlayer to 17.8.0: http://www.smplayer.info/en/changes Ok? Comments? Cheers.- -- Sending from my toaster.
Re: NEW: devel/riscv-elf
On Tue, Aug 08, 2017 at 01:16:15AM -0600, Anthony J. Bentley wrote: > > Kevin Lo writes: > > On Wed, Aug 02, 2017 at 09:47:55PM +0200, Florian Stinglmayr wrote: > > > > > > > Comments/OKs ? > > > > > > Works for me. Once I have my HiFive1 I will give this a try on real > > > hardware. > > > > Thanks for testing. Any OKs? > > I can compile programs with it. No way to test the resulting executables, > but the port doesn't substantially differ from arm-elf. ok bentley@ Thanks for the review. I'll create a port for spike. Once it works for you, I'll commit the riscv-elf port. Thanks, Kevin
Re: NEW: converters/k2pdfopt
one of the patches has ^M in, that's going to break at some point or at least make emailed diffs not work very well - I would recommend a post-extract that does "perl -i -pe 's/\r$$//' $file"
Re: NEW: converters/k2pdfopt
Forgot to rerun update-patches and so the install target was missing. Correct archive attached. k2pdfopt.tgz Description: application/tar-gz
NEW: converters/k2pdfopt
Hi, Behold a very disgusting but incredibly useful port! This is the first tool that makes PDF's readable on Kindle devices. To me, and probably many others, it is super useful because now I can finally read research papers on my e-reader. Even in two-column format, this program outputs flawless documents! Typical use k2pdfopt -dev kv -mode 2col input.pdf Supported devices (but you can define your own if measure your screen size) 1. Kindle 1-5 (k2) 2. Kindle DX (dx) 3. Kindle Paperwhite (kpw) 4. Kindle Paperwhite 2 (kp2) 5. Kindle Paperwhite 3 (kp3) 6. Pocketbook Basic 2 (pb2) 7. Kindle Voyage (kv) 8. Nook Simple Touch (nookst) 9. Kobo Touch (kbt) 10. Kobo Glo (kbg) 11. Kobo Glo HD (kghd) 12. Kobo Glo HD Full Screen (kghdfs) 13. Kobo Mini (kbm) 14. Kobo Aura (kba) 15. Kobo Aura HD (kbhd) 16. Kobo H2O (kbh2o) 17. Kobo H2O Full Screen (kbh2ofs) 18. Kobo Aura One (kao) 19. Nexus 7 (nex7) 20. Other (specify width, height, etc.) Port also available on Github. OK? Paul k2pdfopt.tgz Description: application/tar-gz
Re: mail/courier-* update
On 2017/07/26 15:42, Giovanni Bechis wrote: > Hi, > update to courier stuff, is it ok with COMPILER additions (c++11 needed) ? > Cheers > Giovanni courier-authlib failed in bulk: gmake[3]: Entering directory '/usr/obj/ports/courier-authlib-0.68.0/courier-authlib-0.68.0/libs/rfc822' /usr/bin/libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include -O2 -pipe -Wall -I.. -I./.. -MT rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c -o rfc2047u.lo rfc2047u.c cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include -O2 -pipe -Wall -I.. -I./.. -MT rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c rfc2047u.c -fPIC -DPIC -o .libs/rfc2047u.o rfc2047u.c:18:10: fatal error: 'idna.h' file not found #include ^~~~ 1 error generated.
Re: git security update
On Fri, Aug 11, 2017 at 11:10:30AM +0300, Paul Irofti wrote: > On Fri, Aug 11, 2017 at 12:41:45AM -0400, Daniel Jakots wrote: > > Hello && coucou Benoit, > > > > Git's upstream released a couple of git releases to fix > > CVE-2017-1000117. Here's diff that update old-stable, stable and > > current. > > > > I went the lazy way which is 'update to latest bugfix release' and not > > just backporting patches. This was the easiest thing for me and it > > "sounds like the correct approach to" sthen :) > > > > Test, comments and ok? > > OK for -current, -stable still building... OK -stable.
[Update / security] PostgreSQL 9.6.4
Hi,
A new version of PostgreSQL is available. It fixes 3 CVE:
CVE-2017-7546: Empty password accepted in some authentication methods
CVE-2017-7547: The "pg_user_mappings" catalog view discloses passwords to users
lacking server privileges
CVE-2017-7548: lo_put() function ignores ACLs
Tested on @amd64.
Comments, ok ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.227
diff -u -p -u -p -r1.227 Makefile
--- Makefile 13 Jun 2017 12:59:47 - 1.227
+++ Makefile 11 Aug 2017 08:23:10 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 9.6.3
+VERSION= 9.6.4
PREV_MAJOR= 9.5
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
@@ -16,10 +16,6 @@ PKGNAME-docs= postgresql-docs-${VERSION}
PKGNAME-contrib=postgresql-contrib-${VERSION}
PKGNAME-plpython=postgresql-plpython-${VERSION}
PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-main= 0
-REVISION-server= 1
-REVISION-contrib= 0
-REVISION-pg_upgrade= 0
CATEGORIES= databases
SHARED_LIBS= ecpg 7.8 \
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 distinfo
--- distinfo 17 May 2017 07:34:19 - 1.66
+++ distinfo 11 Aug 2017 08:23:10 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.3.tar.gz) = 3wiDciMLHdIdh7uBaGRxUI9MQglNT08ytdjmhv6mn6Y=
-SIZE (postgresql-9.6.3.tar.gz) = 25536998
+SHA256 (postgresql-9.6.4.tar.gz) = rlx+IgvUvaTF9rD6lgG0+c1XvvhLEAI2HhmSMUgLz9A=
+SIZE (postgresql-9.6.4.tar.gz) = 25636545
Index: patches/patch-src_pl_plperl_GNUmakefile
===
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_pl_plperl_GNUmakefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_pl_plperl_GNUmakefile
--- patches/patch-src_pl_plperl_GNUmakefile 11 May 2017 13:44:15 - 1.1
+++ patches/patch-src_pl_plperl_GNUmakefile 11 Aug 2017 08:23:10 -
@@ -3,12 +3,12 @@ $OpenBSD: patch-src_pl_plperl_GNUmakefil
Index: src/pl/plperl/GNUmakefile
--- src/pl/plperl/GNUmakefile.orig
+++ src/pl/plperl/GNUmakefile
-@@ -12,7 +12,7 @@ override CPPFLAGS += -DPLPERL_HAVE_UID_GID
- override CPPFLAGS += -Wno-comment
- endif
-
--override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
-+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE -DBIG_TIME
+@@ -16,7 +16,7 @@ endif
+ # probably because it sometimes contains some header files with names
+ # that clash with some of ours, or with some that we include, notably on
+ # Windows.
+-override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
++override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE -DBIG_TIME
rpathdir = $(perl_archlibexp)/CORE
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 PLIST-docs
--- pkg/PLIST-docs 17 May 2017 07:34:19 - 1.78
+++ pkg/PLIST-docs 11 Aug 2017 08:23:10 -
@@ -903,6 +903,7 @@ share/doc/postgresql/html/release-9-2-19
share/doc/postgresql/html/release-9-2-2.html
share/doc/postgresql/html/release-9-2-20.html
share/doc/postgresql/html/release-9-2-21.html
+share/doc/postgresql/html/release-9-2-22.html
share/doc/postgresql/html/release-9-2-3.html
share/doc/postgresql/html/release-9-2-4.html
share/doc/postgresql/html/release-9-2-5.html
@@ -920,6 +921,7 @@ share/doc/postgresql/html/release-9-3-14
share/doc/postgresql/html/release-9-3-15.html
share/doc/postgresql/html/release-9-3-16.html
share/doc/postgresql/html/release-9-3-17.html
+share/doc/postgresql/html/release-9-3-18.html
share/doc/postgresql/html/release-9-3-2.html
share/doc/postgresql/html/release-9-3-3.html
share/doc/postgresql/html/release-9-3-4.html
@@ -933,6 +935,7 @@ share/doc/postgresql/html/release-9-4-1.
share/doc/postgresql/html/release-9-4-10.html
share/doc/postgresql/html/release-9-4-11.html
share/doc/postgresql/html/release-9-4-12.html
+share/doc/postgresql/html/release-9-4-13.html
share/doc/postgresql/html/release-9-4-2.html
share/doc/postgresql/html/release-9-4-3.html
share/doc/postgresql/html/release-9-4-4.html
@@ -949,10 +952,12 @@ share/doc/postgresql/html/release-9-5-4.
share/doc/postgresql/html/release-9-5-5.html
share/doc/postgresql/html/release-9-5-6.html
share/doc/postgresql/html/release-9-5-7.html
+share/doc/postgresql/html/release-9-5-8.html
share/doc/postgresql/html/release-9-5.html
share/doc/postgresql/html/release-9-6-
Re: git security update
On Fri, Aug 11, 2017 at 12:41:45AM -0400, Daniel Jakots wrote:
> Hello && coucou Benoit,
>
> Git's upstream released a couple of git releases to fix
> CVE-2017-1000117. Here's diff that update old-stable, stable and
> current.
>
> I went the lazy way which is 'update to latest bugfix release' and not
> just backporting patches. This was the easiest thing for me and it
> "sounds like the correct approach to" sthen :)
>
> Test, comments and ok?
OK for -current, -stable still building...
>
> Cheers,
> Daniel
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.178
> diff -u -p -r1.178 Makefile
> --- Makefile 5 Aug 2017 19:09:05 - 1.178
> +++ Makefile 11 Aug 2017 04:24:54 -
> @@ -4,7 +4,7 @@ COMMENT-main =GIT - Tree History Storag
> COMMENT-svn =GIT - subversion interoperability tools
> COMMENT-x11 =GIT - graphical tools
>
> -V = 2.14.0
> +V = 2.14.1
> DISTNAME = git-${V}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-svn =git-svn-${V}
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/git/distinfo,v
> retrieving revision 1.135
> diff -u -p -r1.135 distinfo
> --- distinfo 5 Aug 2017 19:09:05 - 1.135
> +++ distinfo 11 Aug 2017 04:24:54 -
> @@ -1,4 +1,4 @@
> -SHA256 (git-2.14.0.tar.gz) = yaZmRdacZ6dCGDGa/j1sVQf7kdq4AUYF34luk58Gvkg=
> -SHA256 (git-manpages-2.14.0.tar.gz) =
> riEZ/5I1BTlpHxOhHyqU5iVtzOY+CYMswWA2XdBQY2s=
> -SIZE (git-2.14.0.tar.gz) = 6987666
> -SIZE (git-manpages-2.14.0.tar.gz) = 665143
> +SHA256 (git-2.14.1.tar.gz) = AZJTSbloOUDlOmIe5I3Z2aw/nlnAeYBrWDIcLPhaRGQ=
> +SHA256 (git-manpages-2.14.1.tar.gz) =
> jFgQzmXUTNMzMn06EVxbRicSovgSJdFC4HvYia2NwOA=
> +SIZE (git-2.14.1.tar.gz) = 6987933
> +SIZE (git-manpages-2.14.1.tar.gz) = 665202
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.158
> diff -u -p -r1.158 Makefile
> --- Makefile 28 Jun 2016 07:27:14 - 1.158
> +++ Makefile 11 Aug 2017 04:33:41 -
> @@ -4,7 +4,7 @@ COMMENT-main =GIT - Tree History Storag
> COMMENT-svn =GIT - subversion interoperability tools
> COMMENT-x11 =GIT - graphical tools
>
> -V = 2.9.0
> +V = 2.9.5
> DISTNAME = git-${V}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-svn =git-svn-${V}
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/git/distinfo,v
> retrieving revision 1.121
> diff -u -p -r1.121 distinfo
> --- distinfo 28 Jun 2016 07:27:14 - 1.121
> +++ distinfo 11 Aug 2017 04:33:41 -
> @@ -1,4 +1,4 @@
> -SHA256 (git-2.9.0.tar.gz) = v/dWD1YC/Njjdmng9l7wjG7cmW5PMk5O1ruKhHZeML0=
> -SHA256 (git-manpages-2.9.0.tar.gz) =
> NbppqFYFKaqDfjlabWyNQvTSm0CjwcxuPcabsfqtszI=
> -SIZE (git-2.9.0.tar.gz) = 5903371
> -SIZE (git-manpages-2.9.0.tar.gz) = 629249
> +SHA256 (git-2.9.5.tar.gz) = j6V1M4E31thQtS0gfPcVXNH0AD69aY8Pt19l77hi738=
> +SHA256 (git-manpages-2.9.5.tar.gz) =
> tRWULoGiv68bJDehV8Qig+lzHS2YaU4n9vItaZypKSw=
> +SIZE (git-2.9.5.tar.gz) = 5928730
> +SIZE (git-manpages-2.9.5.tar.gz) = 633471
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.168
> diff -u -p -r1.168 Makefile
> --- Makefile 26 Mar 2017 19:07:10 - 1.168
> +++ Makefile 11 Aug 2017 04:27:51 -
> @@ -4,7 +4,7 @@ COMMENT-main =GIT - Tree History Storag
> COMMENT-svn =GIT - subversion interoperability tools
> COMMENT-x11 =GIT - graphical tools
>
> -V = 2.12.2
> +V = 2.12.4
> DISTNAME = git-${V}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-svn =git-svn-${V}
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/git/distinfo,v
> retrieving revision 1.129
> diff -u -p -r1.129 distinfo
> --- distinfo 26 Mar 2017 19:07:10 - 1.129
> +++ distinfo 11 Aug 2017 04:27:51 -
> @@ -1,4 +1,4 @@
> -SHA256 (git-2.12.2.tar.gz) = 2cbXh6JGcNflEA2yNnwlCtl1bvgIT7FTpGuC8dGG+Ng=
> -SHA256 (git-manpages-2.12.2.tar.gz) =
> bn7VA/EZBzTlfJQn3zVrQgIPEl+jarBHh3eWCmgq31A=
> -SIZE (git-2.12.2.tar.gz) = 6389118
> -SIZE (git-manpages-2.12.2.tar.gz) = 653673
> +SHA256 (git-2.12.4.tar.gz) = sleG8KE+OalVjuylbADHWHA8gDvekPm8WrVPS+Lrsf8=
> +SHA256 (git-manpages-2.12.4.tar.gz) =
> 4OashhshzmBHNnTYj48+GvbifVugzt3vL4z/Am8ux9I=
> +SIZE (git-2.12.4.tar.gz) = 6407661
> +SIZE (git-manpages-2.12.4.tar.gz) = 654944
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
> retrieving revision 1.69
> diff -u -p -r1.69 patch-Makefile
> --- patches/patch
Re: git security update
On Fri, Aug 11, 2017 at 6:41 AM, Daniel Jakots wrote: > Hello && coucou Benoit, > > Git's upstream released a couple of git releases to fix > CVE-2017-1000117. Here's diff that update old-stable, stable and > current. > > I went the lazy way which is 'update to latest bugfix release' and not > just backporting patches. This was the easiest thing for me and it > "sounds like the correct approach to" sthen :) > > Test, comments and ok? > > Cheers, > Daniel ok with me for the -current one. Ciao! David
