[macppc/mips64, all archs] Fix multimedia/synfig, mark BROKEN-powerpc
Spotted during the macppc bulk, multimedia/synfigstudio does not build,
because of synfig:
> synfig(59818) [05:20:15] info: Loading file: synfig_icon.sif
> gmake[2]: Leaving directory
> '/usr/obj/ports/synfigstudio-1.2.1/synfigstudio-1.2.1/images'
> gmake[2]: *** [Makefile:1414: 128x128/synfig_icon.png] Segmentation fault
> (core dumped)
Also mips64 is impacted:
> http://build-failures.rhaalovely.net/mips64/2020-04-02/multimedia/synfigstudio.log
Upstream fixed the issue already [0]
This does not fix synfigstudio's build on macppc, because synfig
segfaults there in multi-threaded mode [1]. It was the case with gcc
already, but clang exposes it even more. Due to the high build time
implied, i would like to see synfig marked BROKEN-powerpc.
Comments/feedback are welcome,
Charlène.
[0]
https://github.com/synfig/synfig/commit/02a02d759ebeb6458c4f05ea90dde0caa52ce321
[1] https://bin.charlenew.xyz/macppc/paths/multimedia/synfigstudio.log
Index: Makefile
===
RCS file: /cvs/ports/multimedia/synfig/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile10 Nov 2019 15:32:56 - 1.30
+++ Makefile22 Apr 2020 05:41:57 -
@@ -1,11 +1,13 @@
# $OpenBSD: Makefile,v 1.30 2019/11/10 15:32:56 ajacoutot Exp $
+BROKEN-powerpc = segfault in multi-threaded mode, synfigstudio can't be
built
+
COMMENT = 2D animation software
V= 1.2.1
DISTNAME = synfig-$V
API_V =1.0
-REVISION = 4
+REVISION = 5
SHARED_LIBS += synfig2.0 # 0.0
Index: patches/patch-src_synfig_filesystem_cpp
===
RCS file: patches/patch-src_synfig_filesystem_cpp
diff -N patches/patch-src_synfig_filesystem_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_synfig_filesystem_cpp 22 Apr 2020 05:41:57 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix segfaults during the build of multimedia/synfigstudio, from
+https://github.com/synfig/synfig/issues/822
+
+Index: src/synfig/filesystem.cpp
+--- src/synfig/filesystem.cpp.orig
src/synfig/filesystem.cpp
+@@ -181,7 +181,7 @@ String FileSystem::fix_slashes(const String )
+ {
+ String fixed = etl::cleanup_path(filename);
+ if (fixed == ".") fixed = "";
+- for(size_t i = 0; i < filename.size(); ++i)
++ for(size_t i = 0; i < fixed.size(); ++i)
+ if (fixed[i] == '\\') fixed[i] = '/';
+ return fixed;
+ }
Re: Remove mail/spam (was: Re: [macppc, mips64] Unbreak mail/dspam)
On Wed, 22 Apr 2020 01:12:34 +0200 Jeremie Courreges-Anglas wrote: > On Tue, Apr 21 2020, Stuart Henderson wrote: > > OK. Or I would also be OK with removing this port. > > I suggest we delete it. It was already on life support upstream when > Landry updated it to the latest version back in 2013. dspam was an > awesome antispam solution, but people have to move on. > > Charlene, do you want to handle the removal? If so, ok jca@ > (Else I can do it.) OK cwen@ to remove it, please do it :) > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE > 1524 E7EE >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/04/21 22:31:54 Modified files: security/openssl/1.1: Makefile distinfo security/openssl/1.1/pkg: PLIST Log message: update to OpenSSL 1.1.1g. Addresses one high severity issue, CVE-2020-1967. ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/04/21 20:12:16 Modified files: devel/quirks : Tag: OPENBSD_6_6 Makefile devel/quirks/files: Tag: OPENBSD_6_6 Quirks.pm Log message: Add cve entry for openvpn Reminded by kn@, thanks!
Re: [update] games/golly 3.2->3.3
On Tue, Apr 21, 2020 at 06:41:16PM -0400, Andrea Fleckenstein wrote:
> James Turner writes:
>
> > On Tue, Apr 21, 2020 at 04:48:25PM -0400, Andrea Fleckenstein wrote:
> >> Hello,
> >>
> >> here is an update to games/golly. RIP John Conway.
> >>
> >> I only had to modify one patch, because detection of the gtk3 toolkit
> >> is now upstream. builds/runs on amd64, no tests. I assume if
> >> "make show-required-by" prints nothing there's nothing that depends on
> >> golly that I have to test, is this right?
> >>
> >> obviously can wait until after 6.7 release
> >>
> >> this is my first port update, so I would really appreciate any advice
> >> on porting, both things to look out for when doing updates and how to
> >> submit to ports@ (i've just put the output of `cvs diff` below, is
> >> that okay?)
> >>
> >> Thanks very much,
> >> Andrea
> >>
> >
> > Hi Andrea,
> >
> > I think you are missing some of your diff? I'm not seeing the updates to
> > Makefile or distinfo for the change to 3.3?
>
> Oops. See below.
>
Portwise this looks fine to me. ok jturner@ for now or after unlock.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/golly/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 12 Jul 2019 20:46:19 - 1.17
> +++ Makefile 21 Apr 2020 22:38:58 -
> @@ -2,8 +2,7 @@
>
> COMMENT =game of life simulator
>
> -PKGNAME =golly-3.2
> -REVISION = 2
> +PKGNAME =golly-3.3
> DISTNAME = ${PKGNAME}-src
> WRKSRC = ${WRKDIST}/gui-wx/configure
> CATEGORIES = games math
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/golly/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 2 Jan 2019 12:43:19 - 1.5
> +++ distinfo 21 Apr 2020 22:38:58 -
> @@ -1,2 +1,2 @@
> -SHA256 (golly-3.2-src.tar.gz) = TQL3hZK16iEfHO2i1bpV6xDgE+z5W4phxwYTV/mq6TE=
> -SIZE (golly-3.2-src.tar.gz) = 5261483
> +SHA256 (golly-3.3-src.tar.gz) = iP13axr9dj7zKsbm2V3fy8UbdPbvah87qaplkpXVc8g=
> +SIZE (golly-3.3-src.tar.gz) = 5465595
> cvs server: Diffing files
> cvs server: Diffing patches
> Index: patches/patch-gui-wx_configure_configure
> ===
> RCS file: /cvs/ports/games/golly/patches/patch-gui-wx_configure_configure,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-gui-wx_configure_configure
> --- patches/patch-gui-wx_configure_configure 2 Jan 2019 12:43:19 -
> 1.4
> +++ patches/patch-gui-wx_configure_configure 21 Apr 2020 22:38:58 -
> @@ -45,38 +45,14 @@ Index: gui-wx/configure/configure
> fi
> ac_ext=c
> ac_cpp='$CPP $CPPFLAGS'
> -@@ -5793,7 +5777,7 @@ $as_echo "will be automatically detected" >&6; }
> - else
> - TOOLKIT="$withval"
> -
> --if test "$TOOLKIT" != "gtk1" -a
> "$TOOLKIT" != "gtk2" -a \
> -+if test "$TOOLKIT" != "gtk1" -a
> "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
> - "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a
> \
> - "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
> - "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ;
> then
> -@@ -6268,6 +6252,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
> -
> - WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
> - WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
> -+WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
> - WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
> - WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
> - WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
> -@@ -6279,6 +6264,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
> - WX_PORT="unknown"
> - if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
> - if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
> -+if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
> - if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
> - if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
> - if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
> -@@ -6353,9 +6339,6 @@ $as_echo "$WX_PORT" >&6; }
> - if test "$DEBUG" = "1"; then
> - CXXFLAGS="$CXXFLAGS -g -O0"
> +@@ -6335,8 +6319,8 @@ $as_echo "$WX_PORT" >&6; }
> CFLAGS="$CFLAGS -g -O0"
> --else
> + elif test "$DEBUG" = "0"; then
> + BUILD="release"
> -CXXFLAGS="$CXXFLAGS -O2"
> -CFLAGS="$CFLAGS -O2"
> ++CXXFLAGS="$CXXFLAGS"
> ++CFLAGS="$CFLAGS"
> fi
>
>if test
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/04/21 20:09:55 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Add cve entry for openvpn
Re: NEW: devel/arduino-esp8266 2.6.3
On Mon, Apr 06 2020, Tracey Emery wrote: > Hello, > > This new port is the framework to program Espressif ESP8266 chipsets via > the Arduino environment. > > Used and tested on amd64 for a few months. > > OK? Have you tried to use the .zip released upstream at https://github.com/esp8266/Arduino/releases ? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: devel/mkspiffs 0.2.3
On Mon, Apr 06 2020, Tracey Emery wrote:
> Hello,
>
> This new port is a tool specifically patched to build and upack SPIFFS
> images for ESP32 and ESP8266 embedded devices, using SPIFFS as the
> submodule. It is a runtime dependency for the next two arduino-core
> ports I'll be sending.
>
> I've been using this on amd64 for a few months.
>
> OK?
A few cleanups:
- enforce CC/CXX instead of relying on COMPILER=ports-clang setting up
gcc and g++ symlinks. Since this ports uses C++11 set COMPILER =
base-clang ports-gcc (both successfully tested on amd64)
- drop -Os from CFLAGS/CXXFLAGS
- don't strip the resulting executable, else DEBUG=-g is useless
- refresh WANTLIB
- just use GH_TAGNAME instead of V
- I think the DISTFILES dance is complicated enough without complicated
constructs like ${SPFS_V:C/().*/\1/}. Why not use the full
hash?
- drop https://github.com/igrr/mkspiffs from DESCR (already taken
automatically from HOMEPAGE, see pkg_info mkspiffs)
If you like those changes, ok jca@
It's a shame there isn't more documentation than mkspiffs --help.
I would suggest upstream to publish source tarballs with vendored
spiffs, after all they already publish a lot of assets for releases:
https://github.com/igrr/mkspiffs/releases
mkspiffs.2.tgz
Description: Binary data
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
devel/mk and friends: project moved
The HOMEPAGE of those orts is now invalid. ./libbio/Makefile:HOMEPAGE= http://pdos.lcs.mit.edu/~rsc/software/ ./libfmt/Makefile:HOMEPAGE= http://pdos.lcs.mit.edu/~rsc/software/ ./libregexp9/Makefile:HOMEPAGE= http://pdos.lcs.mit.edu/~rsc/software/ ./libutf/Makefile:HOMEPAGE= http://pdos.lcs.mit.edu/~rsc/software/ ./mk/Makefile:HOMEPAGE= http://pdos.lcs.mit.edu/~rsc/software/ The automatic redirection to https://pdos.lcs.mit.edu/~rsc/software/ fails because of wrong hostname in certificate. https://pdos.csail.mit.edu/~rsc/software/ redirects to https://9fans.github.io/plan9port/unix/ which seems to be the current home for this software. This could serve as a new HOMEPAGE but the tarballs hosted there are unversioned. Could anyone with an interest with this ports take a look and see what can be done? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/04/21 17:52:08 Modified files: net/openvpn: Tag: OPENBSD_6_6 Makefile Added files: net/openvpn/patches: Tag: OPENBSD_6_6 patch-src_openvpn_multi_c Log message: SECURITY backport for CVE-2020-11810: Fix illegal client float
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/04/21 17:43:56 Modified files: net/openvpn: Makefile distinfo net/openvpn/patches: patch-configure patch-include_Makefile_in Removed files: net/openvpn/patches: patch-src_openvpn_ssl_c Log message: SECURITY update to openvpn-2.4.9 Fix for CVE-2020-11810 Changes: https://github.com/OpenVPN/openvpn/blob/release/2.4/Changes.rst#version-249 https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24#OpenVPN2.4.9
Remove mail/spam (was: Re: [macppc, mips64] Unbreak mail/dspam)
On Tue, Apr 21 2020, Stuart Henderson wrote: > OK. Or I would also be OK with removing this port. I suggest we delete it. It was already on life support upstream when Landry updated it to the latest version back in 2013. dspam was an awesome antispam solution, but people have to move on. Charlene, do you want to handle the removal? If so, ok jca@ (Else I can do it.) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] games/golly 3.2->3.3
James Turner writes:
> On Tue, Apr 21, 2020 at 04:48:25PM -0400, Andrea Fleckenstein wrote:
>> Hello,
>>
>> here is an update to games/golly. RIP John Conway.
>>
>> I only had to modify one patch, because detection of the gtk3 toolkit
>> is now upstream. builds/runs on amd64, no tests. I assume if
>> "make show-required-by" prints nothing there's nothing that depends on
>> golly that I have to test, is this right?
>>
>> obviously can wait until after 6.7 release
>>
>> this is my first port update, so I would really appreciate any advice
>> on porting, both things to look out for when doing updates and how to
>> submit to ports@ (i've just put the output of `cvs diff` below, is
>> that okay?)
>>
>> Thanks very much,
>> Andrea
>>
>
> Hi Andrea,
>
> I think you are missing some of your diff? I'm not seeing the updates to
> Makefile or distinfo for the change to 3.3?
Oops. See below.
Index: Makefile
===
RCS file: /cvs/ports/games/golly/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile12 Jul 2019 20:46:19 - 1.17
+++ Makefile21 Apr 2020 22:38:58 -
@@ -2,8 +2,7 @@
COMMENT = game of life simulator
-PKGNAME = golly-3.2
-REVISION = 2
+PKGNAME = golly-3.3
DISTNAME = ${PKGNAME}-src
WRKSRC = ${WRKDIST}/gui-wx/configure
CATEGORIES = games math
Index: distinfo
===
RCS file: /cvs/ports/games/golly/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo2 Jan 2019 12:43:19 - 1.5
+++ distinfo21 Apr 2020 22:38:58 -
@@ -1,2 +1,2 @@
-SHA256 (golly-3.2-src.tar.gz) = TQL3hZK16iEfHO2i1bpV6xDgE+z5W4phxwYTV/mq6TE=
-SIZE (golly-3.2-src.tar.gz) = 5261483
+SHA256 (golly-3.3-src.tar.gz) = iP13axr9dj7zKsbm2V3fy8UbdPbvah87qaplkpXVc8g=
+SIZE (golly-3.3-src.tar.gz) = 5465595
cvs server: Diffing files
cvs server: Diffing patches
Index: patches/patch-gui-wx_configure_configure
===
RCS file: /cvs/ports/games/golly/patches/patch-gui-wx_configure_configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-gui-wx_configure_configure
--- patches/patch-gui-wx_configure_configure2 Jan 2019 12:43:19 -
1.4
+++ patches/patch-gui-wx_configure_configure21 Apr 2020 22:38:58 -
@@ -45,38 +45,14 @@ Index: gui-wx/configure/configure
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5793,7 +5777,7 @@ $as_echo "will be automatically detected" >&6; }
- else
- TOOLKIT="$withval"
-
--if test "$TOOLKIT" != "gtk1" -a
"$TOOLKIT" != "gtk2" -a \
-+if test "$TOOLKIT" != "gtk1" -a
"$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
- "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
- "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
- "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
-@@ -6268,6 +6252,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
-
- WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
- WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
-+WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
- WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
- WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
- WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
-@@ -6279,6 +6264,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
- WX_PORT="unknown"
- if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
- if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
-+if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
- if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
- if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
- if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
-@@ -6353,9 +6339,6 @@ $as_echo "$WX_PORT" >&6; }
- if test "$DEBUG" = "1"; then
- CXXFLAGS="$CXXFLAGS -g -O0"
+@@ -6335,8 +6319,8 @@ $as_echo "$WX_PORT" >&6; }
CFLAGS="$CFLAGS -g -O0"
--else
+ elif test "$DEBUG" = "0"; then
+ BUILD="release"
-CXXFLAGS="$CXXFLAGS -O2"
-CFLAGS="$CFLAGS -O2"
++CXXFLAGS="$CXXFLAGS"
++CFLAGS="$CFLAGS"
fi
if test "x$WX_RESCOMP" != x; then
Re: [macppc, mips64] Unbreak mail/dspam
OK. Or I would also be OK with removing this port.
On 2020/04/21 22:14, Charlene Wendling wrote:
>
> > http://build-failures.rhaalovely.net/mips64/2020-04-02/mail/dspam%2C-main.log
> (same on macppc)
>
> It fails due to some undefined references to libiconv symbols, so i
> changed LDFLAGS for clang archs using ld.bfd, and it builds on macppc
> [0].
>
> Safety REVISION bump for mips64 added.
>
> Comments/feedback are welcome,
>
> Charlène.
>
>
> [0] https://bin.charlenew.xyz/macppc/paths/mail/dspam.log
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/dspam/Makefile,v
> retrieving revision 1.67
> diff -u -p -u -p -r1.67 Makefile
> --- Makefile 17 Jul 2019 14:46:33 - 1.67
> +++ Makefile 21 Apr 2020 20:10:55 -
> @@ -6,9 +6,9 @@ COMMENT-mysql = MySQL driver for dspam
>
> VERSION =3.10.2
> DISTNAME = dspam-${VERSION}
> -REVISION-main = 10
> -REVISION-mysql = 8
> -REVISION-pgsql = 7
> +REVISION-main = 11
> +REVISION-mysql = 9
> +REVISION-pgsql = 8
>
> PKGNAME-main = ${PKGNAME}
> .for p in pgsql mysql
> @@ -100,6 +100,12 @@ CONFIGURE_ARGS +=--disable-domain-scale
> CONFIGURE_ARGS +=--enable-large-scale
> .else
> CONFIGURE_ARGS +=--disable-large-scale
> +.endif
> +
> +# Fix undefined reference errors on clang+ld.bfd archs
> +.include
> +.if ${PROPERTIES:Mclang} && !${PROPERTIES:Mlld}
> +CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
> .endif
>
> post-install:
>
Re: [macppc] Unbreak audio/fluidsynth
On 2020/04/21 18:11, Charlene Wendling wrote: > > fluidsynth can't be built in the current macppc bulk: > > > ../src/utils/fluidsynth_priv.h:32:10: fatal error: 'config_maxmsp43.h' file > > not found > > This is happening because clang defines '__POWERPC__', but not gcc: > > $ /usr/bin/gcc -dM -E - < /dev/null | grep __POWERPC__ > $ /usr/bin/cc -dM -E - < /dev/null | grep __POWERPC__ > #define __POWERPC__ 1 > > The below diff reverts to the gcc "behaviour" and allows to build > fluidsynth on macppc [0]. > > Comments/feedback are welcome, > > Charlène. > > > [0] https://bin.charlenew.xyz/macppc/packages/fluidsynth-1.1.6p5.log > > > Index: patches/patch-src_utils_fluidsynth_priv_h > === > RCS file: patches/patch-src_utils_fluidsynth_priv_h > diff -N patches/patch-src_utils_fluidsynth_priv_h > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-src_utils_fluidsynth_priv_h 21 Apr 2020 16:04:39 - > @@ -0,0 +1,18 @@ > +$OpenBSD$ > + > +Don't use an header that is not provided > + > +Index: src/utils/fluidsynth_priv.h > +--- src/utils/fluidsynth_priv.h.orig > src/utils/fluidsynth_priv.h > +@@ -28,10 +28,6 @@ > + #include "config.h" > + #endif > + > +-#if defined(__POWERPC__) && !(defined(__APPLE__) && defined(__MACH__)) > +-#include "config_maxmsp43.h" > +-#endif > +- > + #if defined(WIN32) && !defined(MINGW32) > + #include "config_win32.h" > + #endif > OK with me. BTW the offending line is gone in newer versions of fluidsynth. If anyone is interested in updating this port, mail me, I have a partial diff for 2.1.2 with the patches merged, but between the move to CMake and changes in how the audio output drivers are hooked in something isn't quite right so it needs poking at a bit.
Re: [update] games/golly 3.2->3.3
On Tue, Apr 21, 2020 at 04:48:25PM -0400, Andrea Fleckenstein wrote: > Hello, > > here is an update to games/golly. RIP John Conway. > > I only had to modify one patch, because detection of the gtk3 toolkit > is now upstream. builds/runs on amd64, no tests. I assume if > "make show-required-by" prints nothing there's nothing that depends on > golly that I have to test, is this right? > > obviously can wait until after 6.7 release > > this is my first port update, so I would really appreciate any advice > on porting, both things to look out for when doing updates and how to > submit to ports@ (i've just put the output of `cvs diff` below, is > that okay?) > > Thanks very much, > Andrea > Hi Andrea, I think you are missing some of your diff? I'm not seeing the updates to Makefile or distinfo for the change to 3.3? > > Index: patches/patch-gui-wx_configure_configure > === > RCS file: /cvs/ports/games/golly/patches/patch-gui-wx_configure_configure,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-gui-wx_configure_configure > --- patches/patch-gui-wx_configure_configure2 Jan 2019 12:43:19 - > 1.4 > +++ patches/patch-gui-wx_configure_configure21 Apr 2020 19:47:37 - > @@ -45,38 +45,14 @@ Index: gui-wx/configure/configure > fi > ac_ext=c > ac_cpp='$CPP $CPPFLAGS' > -@@ -5793,7 +5777,7 @@ $as_echo "will be automatically detected" >&6; } > - else > - TOOLKIT="$withval" > - > --if test "$TOOLKIT" != "gtk1" -a > "$TOOLKIT" != "gtk2" -a \ > -+if test "$TOOLKIT" != "gtk1" -a > "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \ > - "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a > \ > - "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \ > - "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; > then > -@@ -6268,6 +6252,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec > - > - WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*") > - WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") > -+WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*") > - WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") > - WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") > - WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*") > -@@ -6279,6 +6264,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec > - WX_PORT="unknown" > - if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi > - if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi > -+if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi > - if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi > - if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi > - if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi > -@@ -6353,9 +6339,6 @@ $as_echo "$WX_PORT" >&6; } > - if test "$DEBUG" = "1"; then > - CXXFLAGS="$CXXFLAGS -g -O0" > +@@ -6335,8 +6319,8 @@ $as_echo "$WX_PORT" >&6; } > CFLAGS="$CFLAGS -g -O0" > --else > + elif test "$DEBUG" = "0"; then > + BUILD="release" > -CXXFLAGS="$CXXFLAGS -O2" > -CFLAGS="$CFLAGS -O2" > ++CXXFLAGS="$CXXFLAGS" > ++CFLAGS="$CFLAGS" > fi > >if test "x$WX_RESCOMP" != x; then >
[update] games/golly 3.2->3.3
Hello, here is an update to games/golly. RIP John Conway. I only had to modify one patch, because detection of the gtk3 toolkit is now upstream. builds/runs on amd64, no tests. I assume if "make show-required-by" prints nothing there's nothing that depends on golly that I have to test, is this right? obviously can wait until after 6.7 release this is my first port update, so I would really appreciate any advice on porting, both things to look out for when doing updates and how to submit to ports@ (i've just put the output of `cvs diff` below, is that okay?) Thanks very much, Andrea Index: patches/patch-gui-wx_configure_configure === RCS file: /cvs/ports/games/golly/patches/patch-gui-wx_configure_configure,v retrieving revision 1.4 diff -u -p -r1.4 patch-gui-wx_configure_configure --- patches/patch-gui-wx_configure_configure2 Jan 2019 12:43:19 - 1.4 +++ patches/patch-gui-wx_configure_configure21 Apr 2020 19:47:37 - @@ -45,38 +45,14 @@ Index: gui-wx/configure/configure fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -5793,7 +5777,7 @@ $as_echo "will be automatically detected" >&6; } - else - TOOLKIT="$withval" - --if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \ -+if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \ - "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \ - "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \ - "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then -@@ -6268,6 +6252,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec - - WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*") - WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") -+WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*") - WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") - WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") - WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*") -@@ -6279,6 +6264,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec - WX_PORT="unknown" - if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi - if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi -+if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi - if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi - if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi - if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi -@@ -6353,9 +6339,6 @@ $as_echo "$WX_PORT" >&6; } - if test "$DEBUG" = "1"; then - CXXFLAGS="$CXXFLAGS -g -O0" +@@ -6335,8 +6319,8 @@ $as_echo "$WX_PORT" >&6; } CFLAGS="$CFLAGS -g -O0" --else + elif test "$DEBUG" = "0"; then + BUILD="release" -CXXFLAGS="$CXXFLAGS -O2" -CFLAGS="$CFLAGS -O2" ++CXXFLAGS="$CXXFLAGS" ++CFLAGS="$CFLAGS" fi if test "x$WX_RESCOMP" != x; then
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 14:42:00 Modified files: archivers : Makefile databases : Makefile graphics : Makefile mail : Makefile security : Makefile textproc : Makefile www: Makefile Log message: build PHP 7.4 versions of the pecl-* ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 14:41:12 Modified files: security/pecl-mcrypt: Makefile www/pecl-pledge: Makefile Log message: remove the forced FLAVORS that knocked out php 7.1 packages; php 7.1 was already removed so these are no longer needed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 14:38:32 Modified files: lang/php : Makefile Makefile.inc php.port.mk lang/php/pecl : pecl.port.mk Added files: lang/php/7.4 : Makefile distinfo lang/php/7.4/patches: patch-build_php_m4 patch-configure_ac patch-ext_mysqlnd_config9_m4 patch-main_php_h patch-main_php_ini_c patch-php_ini-development patch-php_ini-production patch-sapi_cgi_cgi_main_c patch-sapi_cli_php_cli_c patch-sapi_fpm_fpm_fpm_atomic_h patch-sapi_fpm_fpm_fpm_children_c patch-sapi_fpm_www_conf_in patch-scripts_Makefile_frag patch-scripts_php-config_in patch-scripts_phpize_in lang/php/7.4/pkg: PLIST-apache PLIST-bz2 PLIST-cgi PLIST-curl PLIST-dba PLIST-dbg PLIST-enchant PLIST-gd PLIST-gmp PLIST-imap PLIST-intl PLIST-ldap PLIST-main PLIST-mysqli PLIST-odbc PLIST-pcntl PLIST-pdo_dblib PLIST-pdo_mysql PLIST-pdo_odbc PLIST-pdo_pgsql PLIST-pdo_sqlite PLIST-pgsql PLIST-pspell PLIST-shmop PLIST-snmp PLIST-soap PLIST-sqlite3 PLIST-tidy PLIST-xmlrpc PLIST-xsl PLIST-zip php74_fpm.rc Log message: Provide PHP 7.4 packages. The default version for use in PHP-based ports remains at 7.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 14:32:06 ports/lang/php/7.4 Update of /cvs/ports/lang/php/7.4 In directory cvs.openbsd.org:/tmp/cvs-serv24825/7.4 Log Message: Directory /cvs/ports/lang/php/7.4 added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 14:32:06 ports/lang/php/7.4/pkg Update of /cvs/ports/lang/php/7.4/pkg In directory cvs.openbsd.org:/tmp/cvs-serv24825/7.4/pkg Log Message: Directory /cvs/ports/lang/php/7.4/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 14:32:07 ports/lang/php/7.4/patches Update of /cvs/ports/lang/php/7.4/patches In directory cvs.openbsd.org:/tmp/cvs-serv24825/7.4/patches Log Message: Directory /cvs/ports/lang/php/7.4/patches added to the repository
[macppc, mips64] Unbreak mail/dspam
> http://build-failures.rhaalovely.net/mips64/2020-04-02/mail/dspam%2C-main.log
(same on macppc)
It fails due to some undefined references to libiconv symbols, so i
changed LDFLAGS for clang archs using ld.bfd, and it builds on macppc
[0].
Safety REVISION bump for mips64 added.
Comments/feedback are welcome,
Charlène.
[0] https://bin.charlenew.xyz/macppc/paths/mail/dspam.log
Index: Makefile
===
RCS file: /cvs/ports/mail/dspam/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- Makefile17 Jul 2019 14:46:33 - 1.67
+++ Makefile21 Apr 2020 20:10:55 -
@@ -6,9 +6,9 @@ COMMENT-mysql = MySQL driver for dspam
VERSION = 3.10.2
DISTNAME = dspam-${VERSION}
-REVISION-main =10
-REVISION-mysql = 8
-REVISION-pgsql = 7
+REVISION-main =11
+REVISION-mysql = 9
+REVISION-pgsql = 8
PKGNAME-main = ${PKGNAME}
.for p in pgsql mysql
@@ -100,6 +100,12 @@ CONFIGURE_ARGS += --disable-domain-scale
CONFIGURE_ARGS += --enable-large-scale
.else
CONFIGURE_ARGS += --disable-large-scale
+.endif
+
+# Fix undefined reference errors on clang+ld.bfd archs
+.include
+.if ${PROPERTIES:Mclang} && !${PROPERTIES:Mlld}
+CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
.endif
post-install:
Re: [Update] cad/xschem 2.9.5
Ping? Hannu Vuolasaho su 12. huhtik. 2020 klo 19.53 Hannu Vuolasaho (vuokkose...@gmail.com) kirjoitti: > > Hello everyone! > > Here is update for xschem. A lot of improvements and more > documentation. Symbol library has grown with imported symbols from > gschem. > > Full changelog is in: > http://repo.hu/projects/xschem/releases/changelog-2.9.5.txt > > Best regards, > Hannu Vuolasaho
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 13:37:52 Modified files: textproc/oniguruma: Makefile distinfo textproc/oniguruma/pkg: PLIST Log message: update to oniguruma-6.9.5, tested base-gcc/ports-gcc/clang on amd64, also on aarch64, and with all dependent ports, no changes in the src diff suggest any likelihood of problems on other archs.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/04/21 13:14:12 Modified files: net/synapse: Makefile net/synapse/pkg: README Log message: Include relayd.conf(5) example in README Example/diff from Andrea Fleckenstein, thanks! "looks fine" Renaud Allard (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/21 11:53:47 Modified files: astro/stellarium: Makefile distinfo astro/stellarium/pkg: PLIST Log message: Update to stellarium-0.20.1.
[macppc] Unbreak audio/fluidsynth
fluidsynth can't be built in the current macppc bulk: > ../src/utils/fluidsynth_priv.h:32:10: fatal error: 'config_maxmsp43.h' file > not found This is happening because clang defines '__POWERPC__', but not gcc: $ /usr/bin/gcc -dM -E - < /dev/null | grep __POWERPC__ $ /usr/bin/cc -dM -E - < /dev/null | grep __POWERPC__ #define __POWERPC__ 1 The below diff reverts to the gcc "behaviour" and allows to build fluidsynth on macppc [0]. Comments/feedback are welcome, Charlène. [0] https://bin.charlenew.xyz/macppc/packages/fluidsynth-1.1.6p5.log Index: patches/patch-src_utils_fluidsynth_priv_h === RCS file: patches/patch-src_utils_fluidsynth_priv_h diff -N patches/patch-src_utils_fluidsynth_priv_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_utils_fluidsynth_priv_h 21 Apr 2020 16:04:39 - @@ -0,0 +1,18 @@ +$OpenBSD$ + +Don't use an header that is not provided + +Index: src/utils/fluidsynth_priv.h +--- src/utils/fluidsynth_priv.h.orig src/utils/fluidsynth_priv.h +@@ -28,10 +28,6 @@ + #include "config.h" + #endif + +-#if defined(__POWERPC__) && !(defined(__APPLE__) && defined(__MACH__)) +-#include "config_maxmsp43.h" +-#endif +- + #if defined(WIN32) && !defined(MINGW32) + #include "config_win32.h" + #endif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/21 09:53:39 Modified files: multimedia : Makefile multimedia/py-chromecast: Makefile distinfo multimedia/py-chromecast/pkg: PLIST Log message: Update to py3-chromecast-5.0.0 and move from MODPY_DEFAULT_VERSION_3 to python3 FLAVOR.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/21 09:52:19 Modified files: net: Makefile Log message: py-zeroconf -> py-zeroconf,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/21 09:49:35 Modified files: net/py-zeroconf: Makefile Log message: Move to python3 FLAVOR instead of MODPY_DEFAULT_VERSION_3 since it's module.
Re: Shared Libraries challenges - FreeRDP 2.0.0
On 2020/04/21 07:51, Steve Williams wrote: > I'll work through your patch to fully understand and try it out! Much of it is removing things which are already committed upstream, or obsoleted by upstream changes (and are carried over from previous update attempts to rc3). The rdpdr_main.c change is post-rc3 and disables hotplug support that depends on things not in OpenBSD.
[update] OpenSSL 1.1.1g
OpenSSL released version 1.1.1g including a high severity fix, so this
should probably make 6.7.
The fix itself is tiny:
https://github.com/openssl/openssl/commit/eb563247aef3e83dda7679c43f9649270462e5b1
CVE-2020-1967 (OpenSSL advisory) [High severity] 21 April 2020:
Server or client applications that call the SSL_check_chain()
function during or after a TLS 1.3 handshake may crash due to a NULL
pointer dereference as a result of incorrect handling of the
"signature_algorithms_cert" TLS extension. The crash occurs if an
invalid or unrecognised signature algorithm is received from the
peer. This could be exploited by a malicious peer in a Denial of
Service attack. OpenSSL version 1.1.1d, 1.1.1e, and 1.1.1f are
affected by this issue. This issue did not affect OpenSSL versions
prior to 1.1.1d. Reported by Bernd Edlinger.
The full diff to 1.1.1f is pretty big due to lots of whitespace and
other churn. I could not spot an ABI change (the constant time AES stuff
is disabled by default), neither did check_sym.
Index: Makefile
===
RCS file: /var/cvs/ports/security/openssl/1.1/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile31 Mar 2020 14:50:08 - 1.14
+++ Makefile21 Apr 2020 13:49:42 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.14 2020/03/31 14:50:08 tb Exp $
PORTROACH= limit:^1\.1\.[0-9][a-z] skipb:0 skipv:1.1.1
-V= 1.1.1f
+V= 1.1.1g
SHLIBVER= 11.5
SHARED_LIBS= crypto ${SHLIBVER} \
Index: distinfo
===
RCS file: /var/cvs/ports/security/openssl/1.1/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo31 Mar 2020 14:50:08 - 1.7
+++ distinfo21 Apr 2020 13:49:42 -
@@ -1,2 +1,2 @@
-SHA256 (openssl-1.1.1f.tar.gz) = GGxr/m7PunpbSMR/ihZz0POw5bouJWAt0jtimXXaPzU=
-SIZE (openssl-1.1.1f.tar.gz) = 9792828
+SHA256 (openssl-1.1.1g.tar.gz) = 3bBHdPHjLwxJdR4htnIWrIeFLOsFa3UgmvJENABjbUY=
+SIZE (openssl-1.1.1g.tar.gz) = 9801502
Index: pkg/PLIST
===
RCS file: /var/cvs/ports/security/openssl/1.1/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 17 Mar 2020 18:38:39 - 1.6
+++ pkg/PLIST 21 Apr 2020 14:10:20 -
@@ -3558,6 +3558,7 @@ lib/eopenssl11/man/man3/
@man lib/eopenssl11/man/man3/X509_check_ip_asc.3
@man lib/eopenssl11/man/man3/X509_check_issued.3
@man lib/eopenssl11/man/man3/X509_check_private_key.3
+@man lib/eopenssl11/man/man3/X509_check_purpose.3
@man lib/eopenssl11/man/man3/X509_cmp.3
@man lib/eopenssl11/man/man3/X509_cmp_current_time.3
@man lib/eopenssl11/man/man3/X509_cmp_time.3
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On Thu, Apr 16, 2020 at 06:57:52PM +0200, clematis wrote: > - *but* it won't run out of the box. (2.26.0 was good to go). Got > straight a /var/lib/i2pd/i2pd.core which I haven't looked at yet. I > might be able to have another look at this and re-do the process tomorrow. > > But you might want to double check this in the meantime. (removing user, > group and /var/lib/i2pd each time and clean all) Hi Satmeir, Sorry I didn't have time to look at this sooner. Is that working on your machine? Still crash on mine as soon as I try to start it (rcctl start i2pd) Loaded symbols for /usr/lib/libc.so.96.0 Reading symbols from /usr/libexec/ld.so...Error while reading shared library symbols: Dwarf Error: wrong version in compilation unit header (is 4, should be 2) [in module /usr/libexec/ld.so] #0 BN_num_bits (a=0x696e97f6f80) at /usr/src/lib/libcrypto/bn/bn_lib.c:182 182 return ((i * BN_BITS2) + BN_num_bits_word(a->d[i])); For the record: -- Found OpenSSL: /usr/lib/libcrypto.so.46.1 (found version "2.0.0") Cheers, -- clematis (0x7e96fd2400fe7b59)
Re: Shared Libraries challenges - FreeRDP 2.0.0
Hi,
First, thanks for pointing out the conflict with the installed older
version of freerdp. After the troubleshooting I put into this, it will
be forever in my mind now to check for a conflict with a installed
library! It wasn't a total waste of time as I understand cmake as well
as the build process a bit now.
I'll work through your patch to fully understand and try it out!
Thanks very much again. Made me groan over my coffee this morning when
I read how simple my problem was to resolve... pkg_delete freerdp :D
Cheers,
Steve W.
On 21/04/2020 5:32 a.m., Stuart Henderson wrote:
On 2020/04/20 21:05, Steve Williams wrote:
However, this new fangled CMAKE stuff is a bit annoying. lol.
It's usually much simpler to build things using ports infrastructure which
already knows how to deal with OpenBSD, e.g.
At some point, the libwinpr2.so.2.0.0 gets symbolically linked to
libwinpr2.so.2 and libwinpr2.so
lrwxr-xr-x 1 root wheel 14 Apr 20 19:33 libwinpr2.so ->
libwinpr2.so.2
lrwxr-xr-x 1 root wheel 18 Apr 20 19:33 libwinpr2.so.2 ->
libwinpr2.so.2.0.0
-rwxr-xr-x 1 root wheel 2835760 Apr 20 19:33 libwinpr2.so.2.0.0
this shared library naming scheme is wrong for OpenBSD, ports already takes
care of this.
I think the actual problem you were seeing is due to it trying to use
an old library from the installed version that doesn't have the functions
you showed.
Here is a diff against the -current ports tree which builds ok (as long
as an older version isn't already installed), obviously still has the timer
problem that you won't see until runtime, "[ERROR][com.winpr.synch.timer] -
InitializeWaitableTimer: os specific implementation is missing".
Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile4 Nov 2019 10:30:20 - 1.39
+++ Makefile21 Apr 2020 11:29:38 -
@@ -4,20 +4,13 @@
BROKEN-hppa = undefined reference to __sync_val_compare_and_swap_4
COMMENT = client for Microsoft RDP (remote desktop protocol)
-DISTNAME = freerdp-2.0.0-rc1
-PKGNAME = freerdp-2.0.0rc1
-REVISION = 4
+DISTNAME = freerdp-2.0.0
CATEGORIES = x11 net
-# XXX This version has known security issues.
-
-# XXX Can't be updated without either timer_create() and friends or
-# an alternative timer implementation (as was done for OSX)
-
-SHARED_LIBS += freerdp-client2 0.0 # 2.0
-SHARED_LIBS += freerdp2 0.0 # 2.0
-SHARED_LIBS += winpr-tools2 0.0 # 2.0
-SHARED_LIBS += winpr20.0 # 2.0
+SHARED_LIBS += freerdp-client2 1.0
+SHARED_LIBS += freerdp2 1.0
+SHARED_LIBS += winpr-tools2 1.0
+SHARED_LIBS += winpr21.0
HOMEPAGE = https://www.freerdp.com/
MASTER_SITES =https://pub.freerdp.com/releases/
@@ -25,8 +18,9 @@ MASTER_SITES =https://pub.freerdp.com/
# Apache 2.0
PERMIT_PACKAGE = Yes
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec
-WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile
+WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xv
+WANTLIB += avcodec avutil c crypto cups execinfo m pthread ssl
+WANTLIB += swresample xkbfile
# thread-local storage
COMPILER =base-clang ports-gcc
@@ -52,12 +46,13 @@ CONFIGURE_ARGS += -DBUILD_TESTING=ON \
-DWITH_LIBSYSTEMD=OFF \
-DWITH_OSS=OFF
-pre-configure:
- ${SUBST_CMD}${WRKSRC}/winpr/libwinpr/CMakeLists.txt
- ${SUBST_CMD}${WRKSRC}/CMakeLists.txt
+#CONFIGURE_ARGS += -DCHANNEL_RDPDR=OFF
.if ${MACHINE_ARCH} == "sparc64"
CONFIGURE_ARGS += -DWITH_NEON=OFF
.endif
+
+pre-configure:
+ cd ${WRKSRC}; ${SUBST_CMD} CMakeLists.txt winpr/libwinpr/CMakeLists.txt
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo28 Apr 2018 19:20:17 - 1.8
+++ distinfo21 Apr 2020 11:29:38 -
@@ -1,2 +1,2 @@
-SHA256 (freerdp-2.0.0-rc1.tar.gz) =
8JogqXEWPCeD77egtIyGBuIPl7RB9xjyUoNDgnex+Hs=
-SIZE (freerdp-2.0.0-rc1.tar.gz) = 6575999
+SHA256 (freerdp-2.0.0.tar.gz) = TuBk6HSGy2/qhdW2tgat2fAt8lznP5gYtJ3nXOvX/t8=
+SIZE (freerdp-2.0.0.tar.gz) = 6857730
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/freerdp/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt28 Apr 2018 19:20:17 - 1.6
+++ patches/patch-CMakeLists_txt21 Apr 2020 11:29:38 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 201
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/04/21 07:12:22 Modified files: security/wpscan: Makefile distinfo Log message: simple update 3.8.0 -> 3.8.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/04/21 07:11:49 Modified files: security/ruby-cms_scanner: Makefile distinfo Log message: simple update 0.9.0 -> 0.10.0
[macppc] devel/py-greenlet does not build
Hi,
greenlet is broken in the current macppc bulk, and neovim won't be built
without it.
> cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -fPIC
> -I/usr/local/include/python2.7 -c greenlet.c -o
> /usr/obj/ports/py-greenlet-0.4.15/greenlet-0.4.15/temp.openbsd-6.7-macppc-2.7/greenlet.o
> In file included from greenlet.c:343:
> In file included from ./slp_platformselect.h:24:
> ./platform/switch_ppc_unix.h:53:14: error: invalid operand for instruction
> __asm__ ("mr %0, 1" : "=g" (stackref) : );
> ^
> :1:11: note: instantiated into assembly here
> mr 0(4), 1
> ^
> In file included from greenlet.c:343:
> In file included from ./slp_platformselect.h:24:
> ./platform/switch_ppc_unix.h:57:13: error: invalid operand for instruction
> "mr 11, %0\n"
> ^
> :1:11: note: instantiated into assembly here
Using the linux code [0] allows greenlet to build, but tests segfault.
The build can also be fixed by applying a related change in
switch-ppc_aix.h [1], but tests segfault as well.
Charlène.
[0]
https://github.com/freebsd/freebsd-ports/blob/master/devel/py-greenlet/files/patch-slp_platformselect.h
[1]
https://github.com/python-greenlet/greenlet/commit/829b44f62b024a3f9b79453b1c0c6a2eb766c336
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 06:40:59 Modified files: net/dhcpcd : Makefile distinfo Log message: update to dhcpcd-9.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/04/21 06:39:48 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm devel/git : Makefile distinfo Log message: Update to git 2.26.2 This release is to address a security issue: CVE-2020-11008 https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.17.5.txt https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.26.2.txt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/04/21 06:20:42 Modified files: devel/ruby-optimist: Makefile distinfo devel/ruby-optimist/pkg: PLIST Log message: simple update 3.0.0 -> 3.0.1
Re: Shared Libraries challenges - FreeRDP 2.0.0
On 2020/04/20 21:05, Steve Williams wrote:
> However, this new fangled CMAKE stuff is a bit annoying. lol.
It's usually much simpler to build things using ports infrastructure which
already knows how to deal with OpenBSD, e.g.
> At some point, the libwinpr2.so.2.0.0 gets symbolically linked to
> libwinpr2.so.2 and libwinpr2.so
> lrwxr-xr-x 1 root wheel 14 Apr 20 19:33 libwinpr2.so ->
> libwinpr2.so.2
> lrwxr-xr-x 1 root wheel 18 Apr 20 19:33 libwinpr2.so.2 ->
> libwinpr2.so.2.0.0
> -rwxr-xr-x 1 root wheel 2835760 Apr 20 19:33 libwinpr2.so.2.0.0
this shared library naming scheme is wrong for OpenBSD, ports already takes
care of this.
I think the actual problem you were seeing is due to it trying to use
an old library from the installed version that doesn't have the functions
you showed.
Here is a diff against the -current ports tree which builds ok (as long
as an older version isn't already installed), obviously still has the timer
problem that you won't see until runtime, "[ERROR][com.winpr.synch.timer] -
InitializeWaitableTimer: os specific implementation is missing".
Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile4 Nov 2019 10:30:20 - 1.39
+++ Makefile21 Apr 2020 11:29:38 -
@@ -4,20 +4,13 @@
BROKEN-hppa = undefined reference to __sync_val_compare_and_swap_4
COMMENT = client for Microsoft RDP (remote desktop protocol)
-DISTNAME = freerdp-2.0.0-rc1
-PKGNAME = freerdp-2.0.0rc1
-REVISION = 4
+DISTNAME = freerdp-2.0.0
CATEGORIES = x11 net
-# XXX This version has known security issues.
-
-# XXX Can't be updated without either timer_create() and friends or
-# an alternative timer implementation (as was done for OSX)
-
-SHARED_LIBS += freerdp-client2 0.0 # 2.0
-SHARED_LIBS += freerdp2 0.0 # 2.0
-SHARED_LIBS += winpr-tools2 0.0 # 2.0
-SHARED_LIBS += winpr20.0 # 2.0
+SHARED_LIBS += freerdp-client2 1.0
+SHARED_LIBS += freerdp2 1.0
+SHARED_LIBS += winpr-tools2 1.0
+SHARED_LIBS += winpr21.0
HOMEPAGE = https://www.freerdp.com/
MASTER_SITES = https://pub.freerdp.com/releases/
@@ -25,8 +18,9 @@ MASTER_SITES =https://pub.freerdp.com/
# Apache 2.0
PERMIT_PACKAGE = Yes
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec
-WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile
+WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xv
+WANTLIB += avcodec avutil c crypto cups execinfo m pthread ssl
+WANTLIB += swresample xkbfile
# thread-local storage
COMPILER = base-clang ports-gcc
@@ -52,12 +46,13 @@ CONFIGURE_ARGS += -DBUILD_TESTING=ON \
-DWITH_LIBSYSTEMD=OFF \
-DWITH_OSS=OFF
-pre-configure:
- ${SUBST_CMD}${WRKSRC}/winpr/libwinpr/CMakeLists.txt
- ${SUBST_CMD}${WRKSRC}/CMakeLists.txt
+#CONFIGURE_ARGS += -DCHANNEL_RDPDR=OFF
.if ${MACHINE_ARCH} == "sparc64"
CONFIGURE_ARGS += -DWITH_NEON=OFF
.endif
+
+pre-configure:
+ cd ${WRKSRC}; ${SUBST_CMD} CMakeLists.txt winpr/libwinpr/CMakeLists.txt
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo28 Apr 2018 19:20:17 - 1.8
+++ distinfo21 Apr 2020 11:29:38 -
@@ -1,2 +1,2 @@
-SHA256 (freerdp-2.0.0-rc1.tar.gz) =
8JogqXEWPCeD77egtIyGBuIPl7RB9xjyUoNDgnex+Hs=
-SIZE (freerdp-2.0.0-rc1.tar.gz) = 6575999
+SHA256 (freerdp-2.0.0.tar.gz) = TuBk6HSGy2/qhdW2tgat2fAt8lznP5gYtJ3nXOvX/t8=
+SIZE (freerdp-2.0.0.tar.gz) = 6857730
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/freerdp/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt28 Apr 2018 19:20:17 - 1.6
+++ patches/patch-CMakeLists_txt21 Apr 2020 11:29:38 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 201
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -953,9 +953,9 @@ if(WAYLAND_FOUND)
+@@ -1077,9 +1077,9 @@ if(WAYLAND_FOUND)
endif()
if(BSD)
Index: patches/patch-channels_rdpdr_client_rdpdr_main_c
===
RCS file: patches/patch-channels_rdpdr_client_rdpdr_main_c
diff -N patches/patch-channels_rdpdr_client_rdpdr_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-channels_rdpdr_client_rdpdr_main_c21 Apr 2020 11:29:38
-
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/21 04:19:26 Modified files: x11/vlc: Makefile x11/vlc/patches: patch-modules_access_http_Makefile_am Log message: vlc: switch to a better fix for the duplicate symbols. from pkgsrc via brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/04/21 01:02:34 Modified files: www: Makefile Removed files: www/py-django : Makefile Makefile.inc www/py-django/lts: Makefile distinfo www/py-django/lts/pkg: DESCR PLIST README www/py-django/stable: Makefile distinfo www/py-django/stable/pkg: DESCR PLIST README Log message: remove py3-django and py3-django-lts; these ports have no benefit anymore to be packaged as most people will install them via pip. furthermore, as these ports were quite badly outdated it creates a false sense of security for downstream users. also suggested by f.holop ok aja@ rpointel@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/04/21 01:02:44 Modified files: devel/quirks/files: Quirks.pm Log message: register django removal
