UPDATE pwgen
The following diff brings security/pwgen to 2.08, which fixes some bugs. Response maintainer 'fine for me'. -- Björn Ketelaars GPG key: 0x4F0E5F21 diff --git security/pwgen/Makefile security/pwgen/Makefile index 866aea4c7b0..3f8961119b2 100644 --- security/pwgen/Makefile +++ security/pwgen/Makefile @@ -2,8 +2,7 @@ COMMENT= simple password generator -DISTNAME= pwgen-2.07 -REVISION= 2 +DISTNAME= pwgen-2.08 CATEGORIES=security MAINTAINER=Robert Nagy diff --git security/pwgen/distinfo security/pwgen/distinfo index ce21281216e..5fae692561c 100644 --- security/pwgen/distinfo +++ security/pwgen/distinfo @@ -1,2 +1,2 @@ -SHA256 (pwgen-2.07.tar.gz) = 63RZP1gpbCHHHNB5M+BwSS6SIrec7fgdGgLOCcDhFVY= -SIZE (pwgen-2.07.tar.gz) = 53513 +SHA256 (pwgen-2.08.tar.gz) = 2rA90wrVpY5XjFWBJBpuh+GEoY6yw7Lg//qKnPEFyXs= +SIZE (pwgen-2.08.tar.gz) = 54884 diff --git security/pwgen/patches/patch-configure_ac security/pwgen/patches/patch-configure_ac new file mode 100644 index 000..56b5749f3e0 --- /dev/null +++ security/pwgen/patches/patch-configure_ac @@ -0,0 +1,19 @@ +$OpenBSD$ + +Index: configure.ac +--- configure.ac.orig configure.ac +@@ -1,11 +1,12 @@ + AC_INIT(pwgen.c) + AC_PREREQ(2.50) ++AC_CONFIG_HEADERS(config.h) + AC_PROG_CC + AC_PROG_INSTALL + AC_PATH_PROG(MV, mv, mv) + AC_PATH_PROG(RM, rm, rm) + AC_PATH_PROG(SED, sed, sed) + AC_PATH_PROG(PERL, perl, perl) +-AC_CHECK_FUNCS(getopt_long) ++AC_CHECK_FUNCS(arc4random arc4random_uniform getopt_long pledge) + AC_CHECK_HEADERS(getopt.h) + AC_OUTPUT(Makefile) diff --git security/pwgen/patches/patch-configure_in security/pwgen/patches/patch-configure_in deleted file mode 100644 index 26c9a16e2ef..000 --- security/pwgen/patches/patch-configure_in +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.6 2016/01/31 13:35:28 jasper Exp $ configure.in.orig Tue Oct 28 04:39:37 2014 -+++ configure.in Mon Jan 18 14:30:48 2016 -@@ -1,11 +1,12 @@ - AC_INIT(pwgen.c) - AC_PREREQ(2.50) -+AC_CONFIG_HEADERS(config.h) - AC_PROG_CC - AC_PROG_INSTALL - AC_PATH_PROG(MV, mv, mv) - AC_PATH_PROG(RM, rm, rm) - AC_PATH_PROG(SED, sed, sed) - AC_PATH_PROG(PERL, perl, perl) --AC_CHECK_FUNCS(getopt_long) -+AC_CHECK_FUNCS(arc4random arc4random_uniform getopt_long pledge) - AC_CHECK_HEADERS(getopt.h) - AC_OUTPUT(Makefile) diff --git security/pwgen/patches/patch-pwgen_c security/pwgen/patches/patch-pwgen_c index f58d7e3129f..9de7d8bc7ee 100644 --- security/pwgen/patches/patch-pwgen_c +++ security/pwgen/patches/patch-pwgen_c @@ -1,6 +1,7 @@ $OpenBSD: patch-pwgen_c,v 1.2 2016/01/31 13:35:28 jasper Exp $ pwgen.c.orig Tue Oct 28 02:00:39 2014 -+++ pwgen.cMon Jan 18 14:38:37 2016 +Index: pwgen.c +--- pwgen.c.orig pwgen.c @@ -7,6 +7,8 @@ * License. */ @@ -10,9 +11,9 @@ $OpenBSD: patch-pwgen_c,v 1.2 2016/01/31 13:35:28 jasper Exp $ #include #include #include -@@ -94,6 +96,12 @@ int main(int argc, char **argv) - char*buf, *tmp; - void(*pwgen)(char *inbuf, int size, int pw_flags); +@@ -99,6 +101,12 @@ int main(int argc, char **argv) + char*remove=NULL; + void(*pwgen)(char *inbuf, int size, int pw_flags, char *remove); +#ifdef HAVE_PLEDGE + if (pledge("stdio rpath", NULL) == -1) { @@ -23,7 +24,7 @@ $OpenBSD: patch-pwgen_c,v 1.2 2016/01/31 13:35:28 jasper Exp $ pwgen = pw_phonemes; pw_number = pw_random_number; if (isatty(1)) -@@ -162,6 +170,13 @@ int main(int argc, char **argv) +@@ -170,6 +178,13 @@ int main(int argc, char **argv) break; } } diff --git security/pwgen/patches/patch-randnum_c security/pwgen/patches/patch-randnum_c index ae910943fb4..491577d21a8 100644 --- security/pwgen/patches/patch-randnum_c +++ security/pwgen/patches/patch-randnum_c @@ -1,6 +1,7 @@ $OpenBSD: patch-randnum_c,v 1.4 2015/02/09 18:56:11 jasper Exp $ randnum.c.orig Tue Oct 28 02:55:43 2014 -+++ randnum.c Mon Feb 9 19:24:58 2015 +Index: randnum.c +--- randnum.c.orig randnum.c @@ -16,8 +16,18 @@ #include #include @@ -20,7 +21,7 @@ $OpenBSD: patch-randnum_c,v 1.4 2015/02/09 18:56:11 jasper Exp $ #ifdef HAVE_DRAND48 extern double drand48(void); #endif -@@ -76,3 +86,4 @@ int pw_random_number(max_num) +@@ -75,3 +85,4 @@ int pw_random_number(max_num) fprintf(stderr, "No entropy available!\n"); exit(1); }
UPDATE editors/joe
Enclosed a diff for bringing joe to the latest version (4.6), which fixes a couple of bugs. Changelog can be found at https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md Output of 'make lib-depends-check' indicates that curses should be included as WANTLIB instead of ncurses. Comments? -- Björn Ketelaars GPG key: 0x4F0E5F21 diff --git editors/joe/Makefile editors/joe/Makefile index 2e0b050fe74..cecdeb0a8dc 100644 --- editors/joe/Makefile +++ editors/joe/Makefile @@ -2,7 +2,7 @@ COMMENT= Joe's Own Editor -DISTNAME= joe-4.5 +DISTNAME= joe-4.6 CATEGORIES=editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=joe-editor/} @@ -11,7 +11,7 @@ HOMEPAGE= http://joe-editor.sourceforge.net/ # GPLv2 only PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c ncurses m util +WANTLIB= c curses m util BUILD_DEPENDS= converters/libiconv diff --git editors/joe/distinfo editors/joe/distinfo index 6c37e9ba4e8..efbad7ef60a 100644 --- editors/joe/distinfo +++ editors/joe/distinfo @@ -1,2 +1,2 @@ -SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8= -SIZE (joe-4.5.tar.gz) = 1275486 +SHA256 (joe-4.6.tar.gz) = SVoKYfJkBAcP6KcZ2AQG3H8zdiN4jkRbkqn23lEqud4= +SIZE (joe-4.6.tar.gz) = 1895046 diff --git editors/joe/pkg/PLIST editors/joe/pkg/PLIST index 9d337f09bf0..027f48d1257 100644 --- editors/joe/pkg/PLIST +++ editors/joe/pkg/PLIST @@ -8,6 +8,11 @@ bin/rjoe man/ru/ man/ru/man1/ @man man/ru/man1/joe.1 +share/applications/ +share/applications/jmacs.desktop +share/applications/joe.desktop +share/applications/jpico.desktop +share/applications/jstar.desktop share/doc/joe/ share/doc/joe/ChangeLog share/doc/joe/NEWS.md
Re: [NEW] textproc/pup
On Sat, Nov 18, 2017 at 12:01:12PM +0100, Klemens Nanni wrote: > On Fri, Nov 10, 2017 at 11:28:54PM +0100, Klemens Nanni wrote: > > Hey, > > > > here's pup, a small but very helpful utility written in Go; pkg/DESCR: > > > > pup is a command line tool for processing HTML. It reads from > > stdin, prints to stdout, and allows the user to filter parts of > > the page using CSS selectors: > > > > > > https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors > > > > Inspired by http://stedolan.github.io/jq/, pup aims to be a fast > > and flexible way of exploring HTML from the terminal. > > > > Running just fine on my amd64 machine, tests pass. > > > > The port is really simple and only packages the actual binary (no > > upstream manual page). > > > > Feedback, comments? > Any takers? Second bump, port reattached. DESCR now without URLs: $ pkg_info pup Information for inst:pup-0.4.0 Comment: Parsing HTML at the command line Description: pup is a command line tool for processing HTML. It reads from stdin, prints to stdout, and allows the user to filter parts of the page using CSS selectors. Inspired by jq, pup aims to be a fast and flexible way of exploring HTML from the terminal. Maintainer: Klemens Nanni WWW: https://github.com/ericchiang/pup Anyone willing to commit this? pup.tgz Description: Binary data
Re: NEW: fs2open - source port of FreeSpace 2 space sim
Updated port attached using exec and ${TRUEPREFIX} after feedback from sthen@. fs2open.tgz Description: Binary data
Re: UPDATE: audio/puddletag 1.0.5 -> 1.2.0
On Sun, Dec 24, 2017 at 02:33:35AM +0100, Klemens Nanni wrote: > 1.2.0 came out 27.11.2016 already, their sourceforge site redirects to > to the new page and code comes from github now. > > Not sure why the license had a XXX back then but it's clearly settled > now. > > Required versions have been added for clarity, Python 3 is not supported > (yet). > > One patch got in, the other I replaced with a simpler post-install. > > Puddletag continues to work fine for me on amd64. > Feedback? Any takers? Three weeks bump, diff reattached. diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile index 9e542cb439b..e9a39e9fee6 100644 --- a/audio/puddletag/Makefile +++ b/audio/puddletag/Makefile @@ -2,28 +2,32 @@ COMMENT = spreadsheet-like audio file tagger -MODPY_EGG_VERSION = 1.0.5 -REVISION = 1 -DISTNAME = puddletag-${MODPY_EGG_VERSION} +MODPY_EGG_VERSION =1.2.0 +GH_ACCOUNT = keithgg +GH_PROJECT = puddletag +GH_TAGNAME = v${MODPY_EGG_VERSION} CATEGORIES = audio -HOMEPAGE = http://puddletag.sourceforge.net +HOMEPAGE = http://puddletag.net -# XXX +# GPLv3 PERMIT_PACKAGE_CDROM = Yes MODULES = lang/python - +MODPY_VERSION =${MODPY_DEFAULT_VERSION_2} MODPY_SETUPTOOLS = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=puddletag/} - -RUN_DEPENDS = audio/py-mutagen \ - devel/py-configobj \ - devel/py-parsing \ +RUN_DEPENDS = audio/py-mutagen>=1.14 \ devel/desktop-file-utils \ - x11/py-qt4 + devel/py-configobj \ + devel/py-parsing>=1.5.1 \ + x11/py-qt4>=4.5 NO_TEST = Yes +WRKSRC = ${WRKDIST}/source + +post-install: + mv ${PREFIX}/share/man/man1/puddletag.1 ${PREFIX}/man/man1/ + .include diff --git a/audio/puddletag/distinfo b/audio/puddletag/distinfo index ba8b18d3095..096647955c8 100644 --- a/audio/puddletag/distinfo +++ b/audio/puddletag/distinfo @@ -1,2 +1,2 @@ -SHA256 (puddletag-1.0.5.tar.gz) = RpjV7/6PJlRGs1YGi6187QspwfZoJNyUpWiPP//DieI= -SIZE (puddletag-1.0.5.tar.gz) = 958207 +SHA256 (puddletag-1.2.0.tar.gz) = leSGf9BMU0nxneG188HyM207ZtoIwHb7F17491idyA0= +SIZE (puddletag-1.2.0.tar.gz) = 9965110 diff --git a/audio/puddletag/patches/patch-puddlestuff_puddleobjects_py b/audio/puddletag/patches/patch-puddlestuff_puddleobjects_py deleted file mode 100644 index c9bafd10a19..000 --- a/audio/puddletag/patches/patch-puddlestuff_puddleobjects_py +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-puddlestuff_puddleobjects_py,v 1.1 2015/07/28 11:23:53 jca Exp $ - -Fix with recent PyQt4>=4.11.4 - - https://github.com/keithgg/puddletag/issues/261 - https://github.com/keithgg/puddletag/commit/489acd2ee62eb5fbff95f8220dc8958c14871931 - puddlestuff/puddleobjects.py.orig Mon Jul 21 19:26:46 2014 -+++ puddlestuff/puddleobjects.py Tue Jul 28 13:09:44 2015 -@@ -1418,7 +1418,7 @@ class ArtworkLabel(QGraphicsView): - super(ArtworkLabel, self).__init__(*args, **kwargs) - - pal = self.palette() --pal.setBrush(self.backgroundRole(), QBrush(QPalette.Window)) -+pal.setBrush(self.backgroundRole(), QBrush(pal.window())) - self.setAutoFillBackground(True) - self.setPalette(pal) - diff --git a/audio/puddletag/patches/patch-setup_py b/audio/puddletag/patches/patch-setup_py deleted file mode 100644 index 7de03d7f7ec..000 --- a/audio/puddletag/patches/patch-setup_py +++ /dev/null @@ -1,10 +0,0 @@ -$OpenBSD: patch-setup_py,v 1.2 2015/05/01 12:55:38 ajacoutot Exp $ setup.py.orig Sun May 4 19:15:31 2014 -+++ setup.py Fri May 1 14:47:06 2015 -@@ -39,5 +39,5 @@ setup( - scripts = ['puddletag'], - data_files=[('share/pixmaps/', ('puddletag.png',)), - ('share/applications/', ('puddletag.desktop',)), --('share/man/man1/', ('puddletag.1',))] -+('man/man1/', ('puddletag.1',))] - ) diff --git a/audio/puddletag/pkg/PLIST b/audio/puddletag/pkg/PLIST index 945d1e896a9..017738c1732 100644 --- a/audio/puddletag/pkg/PLIST +++ b/audio/puddletag/pkg/PLIST @@ -30,6 +30,8 @@ lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/util.py lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/util.pyc lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/vorbis.py lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/vorbis.pyc +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/wma.py +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/wma.pyc lib/python${MODPY_VERSION}/site-packages/puddlestuff/confirmations.py lib/python${MODPY_VERSION}/site-packages/puddlestuff/confirmations.pyc lib/python${MODPY_VERSION}/site-packages/puddlestuff/constants.py @@ -49,8 +51,14 @@ lib/python${MODPY_VERSION}/site-
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
On 2018/01/13 20:02, Sebastien Marie wrote: > On Sat, Jan 13, 2018 at 02:00:50PM +, Stuart Henderson wrote: > > On 2018/01/13 14:11, Sebastien Marie wrote: > > > I didn't check RUN_DEPENDS, as I didn't expect command-line change. > > > > I wouldn't put it past them to chage command-line again ;) OK, I've compared the help output from old and new, diff is a bit hard to read but it seems pretty close so I don't think there will be a problem. > > > +WANTLIB += ossaudio > > > > I don't _think_ we don't want that.. -DWITH_OSS=OFF ? > > I am unsure... ossaudio is hardcoded for OpenBSD in CMakeLists.txt (see > client/common/CMakeLists.txt file). I did few tests, but I couldn't get > audio (with or without using ossaudio). There was a big effort to remove ossaudio across as much of the ports tree as possible (exceptions mostly for mixer use IIRC). It doesn't seem to be used for anything here and isn't required to build, so I think we should just patch it away. --snip -- --- -- --- -- --- Index: client/common/CMakeLists.txt --- client/common/CMakeLists.txt.orig +++ client/common/CMakeLists.txt @@ -66,11 +66,7 @@ endif() set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_CLIENT_LIBS}) -if(OPENBSD) - target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} ${${MODULE_PREFIX}_LIBS} ossaudio) -else() - target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} ${${MODULE_PREFIX}_LIBS}) -endif() +target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} ${${MODULE_PREFIX}_LIBS}) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ClientTargets) --snip -- --- -- --- -- --- It might not be all that hard to port to sndio, if somebody actually wants audio over this.. > I fuck myself with cvs... sorry about that. > > diff regenerated. No worries :) xfreerdp itself still works for me. remmina needs cvs rm patch-* then it builds, but doesn't work properly for me (displays the window, but doesn't do anything if I enter a hostname and try to connect). I haven't tried vinagre.
Re: NEW: fs2open - source port of FreeSpace 2 space sim
Updated port attached with fixed wrapper script and removed dependency on doxygen after discussion with rsadowski@ By the way, game runs well, played through 3 missions, also mods. Joystick (in my case a Sidewinder Precision 2) works. fs2open.tgz Description: Binary data
Re: NEW: fs2open - source port of FreeSpace 2 space sim
Great game, thanks for porting it! The wrapper script installed at /usr/local/bin/fs2open has this line: /usr/local/bin/fs2open $* I think this is a mistake, it should call the binary at /usr/local/share/fs2open/fs2open. It's already installed with SUBST_CMD, so this will work: --- files/fs2open.orig Sat Jan 13 21:58:51 2018 +++ files/fs2open Sat Jan 13 22:03:35 2018 @@ -8,4 +8,4 @@ print 'could not find directory ~/.local/share/fs2open' exit 1 fi -/usr/local/bin/fs2open $* +${LOCALBASE}/share/fs2open/fs2open $*
Re: [update] OfflineIMAP v7.1.5
On Sat, 13 Jan 2018 22:05:43 +0100, Remi Locherer wrote: > +REVISION = 0 Why? :p without the rev bump, ok danj@
NEW: fs2open - source port of FreeSpace 2 space sim
Hi, Attached is a port of fs2open. fs2open is the portable version of the FreeSpace 2 game engine which was released to the public by creator Volition in ~2002. FreeSpace 2 is a space-fighting game in the vein of the Wing Commander series and is by many regarded as the last great game of the "golden age" of the genre (which was declared dead after abyssmal sales of FreeSpace 2 despite stellar reviews). This port is set up to require the original game files to be installed to ~/.local/share/fs2port. These can be obtained from original game CDs or digital distributors like gog.com. Please note the following aspects of the port: - The license is rather a "non-license" - see the prior discussion here: https://marc.info/?l=openbsd-ports&m=150922734910790&w=2. Therefore, I deactivated all 3 PERMIT_* - I worked around the git submodules situation following the example of emulators/ppsspp. - Upstream generally expects the binary to go into the base directory of the FreeSpace2 game files and I was not able to configure the binary to look in ~/.local/share/fs2open, so I went with a wrapper script solution for this. Incorporated input from bcallah@ on openbsd-wip (github). landry@ and espie@ helped me figure out a portcheck issue (on my end). fs2open.tgz Description: Binary data
Re: UPDATE: security/botan2
It doesn't build on amd64 with ports-gcc, but it doesn't need to because amd64 has clang. If you want to know whether it builds on another arch, test it on that arch or ask if there's someone who can do so. An amd64 test doesn't give any idea whether that will work. On 13 January 2018 20:21:16 Rafael Sadowski wrote: On Sat Jan 13, 2018 at 07:16:14PM +, Stuart Henderson wrote: How do you know? You haven't tested them. I don't understand. It doesn't build with ports-gcc, what else to test? It also fails without all GCC options (expect c++11). On 13 January 2018 18:41:36 Rafael Sadowski wrote: > On Sat Jan 13, 2018 at 02:44:12PM +, Stuart Henderson wrote: > > On 2018/01/13 14:40, Stuart Henderson wrote: > > > On 2018/01/13 15:12, Rafael Sadowski wrote: > > > > I run into the following GCC compile error. Any ideas? > > > > > > > % -> CC=egcc CXX=eg++ make -j8 > > > > % ===> Building for botan2-2.4.0 > > > > % eg++ -fstack-protector -m64 -pthread -mavx2 -fPIC > > -fvisibility=hidden -std=c++11 -D_REENTRANT -O2 -pipe -Wall -Wextra > > -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 > > -Wcast-align -W > > > > % missing-declarations -Wpointer-arith -Wcast-qual > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include/external > > -I/usr/local/includ > > > > % e -c /usr/ports/pobj/botan2-2.4.0/Botan-2.4.0/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp > > -o /usr/ports/pobj/botan2-2.4.0/build-amd64/build/obj/lib/block_threefish_avx2.o > > > > % {standard input}: Assembler messages: > > > > % {standard input}:26: Error: no such instruction: `vmovq 24(%r8),%xmm3' > > > > % {standard input}:27: Error: no such instruction: `vpinsrq > > $1,40(%r8),%xmm3,%xmm0' > > > > % {standard input}:28: Error: no such instruction: `vmovq 8(%r8),%xmm1' > > > > % {standard input}:29: Error: no such instruction: `vmovq 64(%r8),%xmm6' > > > > % {standard input}:30: Error: no such instruction: `vpunpcklqdq > > %xmm3,%xmm1,%xmm3' > > > > % {standard input}:31: Error: no such instruction: `vpunpcklqdq > > %xmm1,%xmm6,%xmm4' > > > > % {standard input}:32: Error: no such instruction: `vinserti128 > > $0x1,%xmm0,%ymm4,%ymm6' > > > > % {standard input}:33: Error: no such instruction: `vmovdqa > > %ymm6,-144(%rbp)' > > > > % {standard input}:34: Error: no such instruction: `vmovq 32(%r8),%xmm6' > > > > % {standard input}:35: Error: no such instruction: `vpinsrq > > $1,48(%r8),%xmm6,%xmm0' > > > > % {standard input}:36: Error: no such instruction: `vmovq (%r8),%xmm6' > > > > % {standard input}:37: Error: no such instruction: `vpinsrq > > $1,16(%r8),%xmm6,%xmm9' > > > > % ... > > > > > > GCC uses binutils assembler, our version is too old to know these > > instructions. > > > > > > Clang has an integrated assembler. > > > > > > > ...Also, I don't think the gcc -m options (like -mavx2 here) do a > > cpuid check, if that's true they can't be used for ports. > > > > Thanks for explaining. Well, then bye bye GCC arches :( > > No need to patch configure.py for mandir. `--mandir` is doing the work. Spotted by kn, thanks! Index: Makefile === RCS file: /cvs/ports/security/botan2/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile16 Nov 2017 23:20:40 - 1.11 +++ Makefile13 Jan 2018 20:12:55 - @@ -2,11 +2,11 @@ COMMENT = crypto and TLS for C++11 -VERSION = 2.3.0 +VERSION = 2.4.0 DISTNAME = Botan-${VERSION} PKGNAME = botan2-${VERSION} -SHARED_LIBS = botan-2 3.0 +SHARED_LIBS = botan-2 4.0 CATEGORIES = security @@ -17,8 +17,7 @@ MAINTAINER = Alexander Bluhm + warning_flags "-Wall -Wextra -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual" + maintainer_warning_flags "-Wunreachable-code -Wdocumentation -Qunused-arguments -Werror -Wno-error=unused-parameter -Wno-error=unreachable-code -Wno-error=deprecated-declarations" + +-optimization_flags "-O3" ++optimization_flags "${CXXFLAGS}" + size_optimization_flags "-Os" + #sanitizer_flags "-fsanitize=address,undefined -fsanitize-coverage=edge,indirect-calls,8bit-counters -fno-sanitize-recover=undefined" + sanitizer_flags "-fsanitize=address,undefined" Index: patches/patch-src_build-data_cc_gcc_txt === RCS file: /cvs/ports/security/botan2/patches/patch-src_build-data_cc_gcc_txt,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_build-data_cc_gcc_txt --- patches/patch-src_build-data_cc_gcc_txt 13 Mar 2017 15:00:39 - 1.1.1.1 +++ patches/patch-src_build-data_cc_gcc_txt 13 Jan 2018 20:12:55 - @@ -1,18 +1,19 @@ $OpenBSD: patch-src_build-data_cc_gcc_txt,v 1.1.1.1 2017/03/13 15:00:39 bluhm Exp $ src/build-data/cc/gcc.txt.orig Tue Jan 10
[update] OfflineIMAP v7.1.5
Hi, OfflineIMAP v7.1.5 was just released. From the announcement mail: -- # Features - Initial commit of snapcraft.yaml. [Evan Dandrea] # Fixes - maxage: don't consider negative UIDs when computing min UID. [Nicolas Sebrecht] - Add missing space to output string. [John Ferlito] # Changes - folder: IMAP: improve search logging. [Nicolas Sebrecht] - no UIDPLUS: improve logging on failures. [Nicolas Sebrecht] - github: remove the trick to download the PR. [Nicolas Sebrecht] -- It works fine for my mail accounts on Dovecot (OpenBSD 6.2) and Currier (Linux). OK? Remi Index: Makefile === RCS file: /cvs/ports/mail/offlineimap/Makefile,v retrieving revision 1.48 diff -u -p -r1.48 Makefile --- Makefile3 Nov 2017 14:49:54 - 1.48 +++ Makefile13 Jan 2018 20:55:58 - @@ -2,12 +2,13 @@ COMMENT= powerful IMAP/Maildir synchronization and reader support -MODPY_EGG_VERSION = 7.1.4 +MODPY_EGG_VERSION = 7.1.5 GH_ACCOUNT = OfflineIMAP GH_PROJECT = offlineimap GH_TAGNAME = v${MODPY_EGG_VERSION} DISTNAME= offlineimap-${MODPY_EGG_VERSION} CATEGORIES=mail +REVISION = 0 HOMEPAGE= http://www.offlineimap.org/ Index: distinfo === RCS file: /cvs/ports/mail/offlineimap/distinfo,v retrieving revision 1.35 diff -u -p -r1.35 distinfo --- distinfo3 Nov 2017 14:49:54 - 1.35 +++ distinfo13 Jan 2018 20:55:58 - @@ -1,2 +1,2 @@ -SHA256 (offlineimap-7.1.4.tar.gz) = xv5KmUWFQrUvEB0lact8ptLHWLwOujcx1OYmOvSMZFQ= -SIZE (offlineimap-7.1.4.tar.gz) = 711048 +SHA256 (offlineimap-7.1.5.tar.gz) = jijnhqAHaOipfZ8ElAZ0SCkhLP+2mQP/uxX6oUedQ+E= +SIZE (offlineimap-7.1.5.tar.gz) = 711529
Re: UPDATE: security/botan2
On Sat Jan 13, 2018 at 07:16:14PM +, Stuart Henderson wrote: > How do you know? You haven't tested them. > I don't understand. It doesn't build with ports-gcc, what else to test? It also fails without all GCC options (expect c++11). > > On 13 January 2018 18:41:36 Rafael Sadowski wrote: > > > On Sat Jan 13, 2018 at 02:44:12PM +, Stuart Henderson wrote: > > > On 2018/01/13 14:40, Stuart Henderson wrote: > > > > On 2018/01/13 15:12, Rafael Sadowski wrote: > > > > > I run into the following GCC compile error. Any ideas? > > > > > > > > > % -> CC=egcc CXX=eg++ make -j8 > > > > > % ===> Building for botan2-2.4.0 > > > > > % eg++ -fstack-protector -m64 -pthread -mavx2 -fPIC > > > -fvisibility=hidden -std=c++11 -D_REENTRANT -O2 -pipe -Wall -Wextra > > > -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 > > > -Wcast-align -W > > > > > % missing-declarations -Wpointer-arith -Wcast-qual > > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include > > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include/external > > > -I/usr/local/includ > > > > > % e -c > > > > > /usr/ports/pobj/botan2-2.4.0/Botan-2.4.0/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp > > > -o > > > /usr/ports/pobj/botan2-2.4.0/build-amd64/build/obj/lib/block_threefish_avx2.o > > > > > % {standard input}: Assembler messages: > > > > > % {standard input}:26: Error: no such instruction: `vmovq > > > > > 24(%r8),%xmm3' > > > > > % {standard input}:27: Error: no such instruction: `vpinsrq > > > $1,40(%r8),%xmm3,%xmm0' > > > > > % {standard input}:28: Error: no such instruction: `vmovq > > > > > 8(%r8),%xmm1' > > > > > % {standard input}:29: Error: no such instruction: `vmovq > > > > > 64(%r8),%xmm6' > > > > > % {standard input}:30: Error: no such instruction: `vpunpcklqdq > > > %xmm3,%xmm1,%xmm3' > > > > > % {standard input}:31: Error: no such instruction: `vpunpcklqdq > > > %xmm1,%xmm6,%xmm4' > > > > > % {standard input}:32: Error: no such instruction: `vinserti128 > > > $0x1,%xmm0,%ymm4,%ymm6' > > > > > % {standard input}:33: Error: no such instruction: `vmovdqa > > > %ymm6,-144(%rbp)' > > > > > % {standard input}:34: Error: no such instruction: `vmovq > > > > > 32(%r8),%xmm6' > > > > > % {standard input}:35: Error: no such instruction: `vpinsrq > > > $1,48(%r8),%xmm6,%xmm0' > > > > > % {standard input}:36: Error: no such instruction: `vmovq (%r8),%xmm6' > > > > > % {standard input}:37: Error: no such instruction: `vpinsrq > > > $1,16(%r8),%xmm6,%xmm9' > > > > > % ... > > > > > > > > GCC uses binutils assembler, our version is too old to know these > > > instructions. > > > > > > > > Clang has an integrated assembler. > > > > > > > > > > ...Also, I don't think the gcc -m options (like -mavx2 here) do a > > > cpuid check, if that's true they can't be used for ports. > > > > > > > Thanks for explaining. Well, then bye bye GCC arches :( > > > > No need to patch configure.py for mandir. `--mandir` is doing the work. Spotted by kn, thanks! Index: Makefile === RCS file: /cvs/ports/security/botan2/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile16 Nov 2017 23:20:40 - 1.11 +++ Makefile13 Jan 2018 20:12:55 - @@ -2,11 +2,11 @@ COMMENT = crypto and TLS for C++11 -VERSION = 2.3.0 +VERSION = 2.4.0 DISTNAME = Botan-${VERSION} PKGNAME = botan2-${VERSION} -SHARED_LIBS = botan-2 3.0 +SHARED_LIBS = botan-2 4.0 CATEGORIES = security @@ -17,8 +17,7 @@ MAINTAINER = Alexander Bluhm https://github.com/randombit/botan/commit/f492fbcca162209d2d87dff1dacdb66b566e10c1 - -Index: src/lib/prov/openssl/openssl_rsa.cpp src/lib/prov/openssl/openssl_rsa.cpp.orig -+++ src/lib/prov/openssl/openssl_rsa.cpp -@@ -15,6 +15,7 @@ - #include - #include - -+#include - #include - #include - Index: patches/patch-src_lib_utils_os_utils_cpp === RCS file: patches/patch-src_lib_utils_os_utils_cpp diff -N patches/patch-src_lib_utils_os_utils_cpp --- patches/patch-src_lib_utils_os_utils_cpp9 Oct 2017 20:05:07 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_lib_utils_os_utils_cpp,v 1.1 2017/10/09 20:05:07 bluhm Exp $ - -Index: src/lib/utils/os_utils.cpp src/lib/utils/os_utils.cpp.orig -+++ src/lib/utils/os_utils.cpp -@@ -10,7 +10,9 @@ - #include - #include - #include -+ - #include -+#include - - #if defined(BOTAN_HAS_BOOST_ASIO) - /* Index: patches/patch-src_tests_main_cpp === RCS file: /cvs/ports/security/botan2/patches/patch-src_tests_main_cpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_tests_main_cpp --- patches/patch-src_tests_main_cpp9 Oct 2017 20:05:07 - 1.2 +++ patches/patch-src_tests_main_cpp13 Jan 2018 20:12:55 - @@ -3,12
Re: UPDATE: security/botan2
How do you know? You haven't tested them. On 13 January 2018 18:41:36 Rafael Sadowski wrote: On Sat Jan 13, 2018 at 02:44:12PM +, Stuart Henderson wrote: On 2018/01/13 14:40, Stuart Henderson wrote: > On 2018/01/13 15:12, Rafael Sadowski wrote: > > I run into the following GCC compile error. Any ideas? > > > % -> CC=egcc CXX=eg++ make -j8 > > % ===> Building for botan2-2.4.0 > > % eg++ -fstack-protector -m64 -pthread -mavx2 -fPIC -fvisibility=hidden -std=c++11 -D_REENTRANT -O2 -pipe -Wall -Wextra -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -W > > % missing-declarations -Wpointer-arith -Wcast-qual -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include/external -I/usr/local/includ > > % e -c /usr/ports/pobj/botan2-2.4.0/Botan-2.4.0/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp -o /usr/ports/pobj/botan2-2.4.0/build-amd64/build/obj/lib/block_threefish_avx2.o > > % {standard input}: Assembler messages: > > % {standard input}:26: Error: no such instruction: `vmovq 24(%r8),%xmm3' > > % {standard input}:27: Error: no such instruction: `vpinsrq $1,40(%r8),%xmm3,%xmm0' > > % {standard input}:28: Error: no such instruction: `vmovq 8(%r8),%xmm1' > > % {standard input}:29: Error: no such instruction: `vmovq 64(%r8),%xmm6' > > % {standard input}:30: Error: no such instruction: `vpunpcklqdq %xmm3,%xmm1,%xmm3' > > % {standard input}:31: Error: no such instruction: `vpunpcklqdq %xmm1,%xmm6,%xmm4' > > % {standard input}:32: Error: no such instruction: `vinserti128 $0x1,%xmm0,%ymm4,%ymm6' > > % {standard input}:33: Error: no such instruction: `vmovdqa %ymm6,-144(%rbp)' > > % {standard input}:34: Error: no such instruction: `vmovq 32(%r8),%xmm6' > > % {standard input}:35: Error: no such instruction: `vpinsrq $1,48(%r8),%xmm6,%xmm0' > > % {standard input}:36: Error: no such instruction: `vmovq (%r8),%xmm6' > > % {standard input}:37: Error: no such instruction: `vpinsrq $1,16(%r8),%xmm6,%xmm9' > > % ... > > GCC uses binutils assembler, our version is too old to know these instructions. > > Clang has an integrated assembler. > ...Also, I don't think the gcc -m options (like -mavx2 here) do a cpuid check, if that's true they can't be used for ports. Thanks for explaining. Well, then bye bye GCC arches :( Index: Makefile === RCS file: /cvs/ports/security/botan2/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile16 Nov 2017 23:20:40 - 1.11 +++ Makefile13 Jan 2018 18:31:53 - @@ -2,11 +2,11 @@ COMMENT = crypto and TLS for C++11 -VERSION = 2.3.0 +VERSION = 2.4.0 DISTNAME = Botan-${VERSION} PKGNAME = botan2-${VERSION} -SHARED_LIBS = botan-2 3.0 +SHARED_LIBS = botan-2 4.0 CATEGORIES = security @@ -17,8 +17,7 @@ MAINTAINER = Alexander Bluhm + warning_flags "-Wall -Wextra -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual" + maintainer_warning_flags "-Wunreachable-code -Wdocumentation -Qunused-arguments -Werror -Wno-error=unused-parameter -Wno-error=unreachable-code -Wno-error=deprecated-declarations" + +-optimization_flags "-O3" ++optimization_flags "${CXXFLAGS}" + size_optimization_flags "-Os" + #sanitizer_flags "-fsanitize=address,undefined -fsanitize-coverage=edge,indirect-calls,8bit-counters -fno-sanitize-recover=undefined" + sanitizer_flags "-fsanitize=address,undefined" Index: patches/patch-src_build-data_cc_gcc_txt === RCS file: /cvs/ports/security/botan2/patches/patch-src_build-data_cc_gcc_txt,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_build-data_cc_gcc_txt --- patches/patch-src_build-data_cc_gcc_txt 13 Mar 2017 15:00:39 - 1.1.1.1 +++ patches/patch-src_build-data_cc_gcc_txt 13 Jan 2018 18:31:53 - @@ -1,18 +1,19 @@ $OpenBSD: patch-src_build-data_cc_gcc_txt,v 1.1.1.1 2017/03/13 15:00:39 bluhm Exp $ src/build-data/cc/gcc.txt.orig Tue Jan 10 04:21:31 2017 -+++ src/build-data/cc/gcc.txt Mon Mar 13 07:14:45 2017 +Index: src/build-data/cc/gcc.txt +--- src/build-data/cc/gcc.txt.orig src/build-data/cc/gcc.txt @@ -1,6 +1,6 @@ macro_name GCC -binary_name g++ +binary_name ${CXX} - output_to_option "-o " - add_include_dir_option -I -@@ -16,7 +16,7 @@ maintainer_warning_flags "-Wold-style-cast -Wsuggest-o + lang_flags "-std=c++11 -D_REENTRANT" + +@@ -9,7 +9,7 @@ warning_flags "-Wall -Wextra -Wpedantic -Wstrict-alias + + maintainer_warning_flags "-Wstrict-overflow=5 -Wold-style-cast -Wsuggest-override -Wshadow -Werror -Wno-error=strict-overflow -Wno-error=deprecated-declarations" - compile_flags "-c" - debug_info_flags "-g" -optimization_flags "-O3" +optimization_flags "${CXXFLAGS}" size_optimization_flags "-Os" Inde
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
On Sat, Jan 13, 2018 at 02:00:50PM +, Stuart Henderson wrote: > On 2018/01/13 14:11, Sebastien Marie wrote: > > I didn't check RUN_DEPENDS, as I didn't expect command-line change. > > I wouldn't put it past them to chage command-line again ;) > > > +WANTLIB += ossaudio > > I don't _think_ we don't want that.. -DWITH_OSS=OFF ? I am unsure... ossaudio is hardcoded for OpenBSD in CMakeLists.txt (see client/common/CMakeLists.txt file). I did few tests, but I couldn't get audio (with or without using ossaudio). > Build fails for me, it tries to use -lrt. > > FAILED: client/X11/xfreerdp > : && /usr/local/bin/ccache /usr/obj/ports/freerdp-2.0.0rc1/bin/cc -O2 -pipe > -I/usr/X11R6/include -I/usr/local/include -Wno-unused-parameter > -Wno-unused-macros -Wno-padded -Wno-c11-extensions -Wno-gnu > -Wno-unused-command-line-argument -Wno-deprecated-declarations -DNDEBUG > client/X11/CMakeFiles/xfreerdp-client.dir/xf_gdi.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_gfx.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_rail.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_tsmf.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_input.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_event.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_channels.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_cliprdr.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_monitor.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_graphics.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_keyboard.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_window.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/xf_client.c.o > client/X11/CMakeFiles/xfreerdp-client.dir/cli/xfreerdp.c.o -o > client/X11/xfreerdp -L/usr/local/lib -L/usr/X11R6/lib > -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/client/common > -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/libfreerdp > -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/winpr/libwinpr > -Wl,-rpath,/usr/local/lib:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/client/common:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/libfreerdp:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/winpr/libwinpr: > -lX11 -lXinerama -lXext -lXcursor -lXv -lXi -lXrender -lXfixes > -lfreerdp-client2 -lfreerdp2 -lm -lrt -lwinpr2 -lossaudio > -Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && : > /usr/bin/ld: cannot find -lrt > I fuck myself with cvs... sorry about that. diff regenerated. -- Sebastien Marie Index: x11/freerdp/Makefile === RCS file: /cvs/ports/x11/freerdp/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- x11/freerdp/Makefile9 Nov 2017 16:50:39 - 1.29 +++ x11/freerdp/Makefile13 Jan 2018 18:53:01 - @@ -5,18 +5,17 @@ BROKEN-arm = unrecognized option -mfpu= BROKEN-hppa = undefined reference to __sync_val_compare_and_swap_4 COMMENT = open source client for Windows Terminal Server -DISTNAME = freerdp-1.2.0beta1 +DISTNAME = freerdp-2.0.0rc1 CATEGORIES = x11 net -REVISION = 2 GH_ACCOUNT = FreeRDP GH_PROJECT = FreeRDP -GH_COMMIT =f5ff6e1bd819a347aa532c1ef1a9cf0c67387507 +GH_TAGNAME = 2.0.0-rc1 -SHARED_LIBS += freerdp-client0.0 # 1.2 -SHARED_LIBS += freerdp 0.0 # 1.2 -SHARED_LIBS += winpr 0.0 # 1.1 -SHARED_LIBS += xfreerdp-client 0.0 # 1.2 +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 HOMEPAGE = http://www.freerdp.com/ @@ -25,7 +24,7 @@ PERMIT_PACKAGE_CDROM =Yes WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile -WANTLIB += z +WANTLIB += ossaudio MODULES = devel/cmake @@ -38,20 +37,13 @@ LIB_DEPENDS = devel/libexecinfo \ print/cups,-libs \ graphics/ffmpeg -CONFIGURE_ARGS += -DWITH_ALSA=OFF \ - -DWITH_CUPS=ON \ +CONFIGURE_ARGS += -DWITH_CUPS=ON \ -DWITH_DIRECTFB=OFF \ -DWITH_GSTREAMER_0_10=OFF \ -DWITH_GSTREAMER_1_0=OFF \ -DWITH_OPENSLES=OFF \ -DWITH_PCSC=ON \ - -DWITH_PULSE=OFF - -# XXX does not build -CONFIGURE_ARGS += -DCHANNEL_DRIVE=OFF - -# -msse3 requires a newer gcc -CONFIGURE_ARGS += -DWITH_SSE2=OFF + -DWITH_LIBSYSTEMD=OFF NO_TEST = Yes Index: x11/freerdp/distinfo === RCS file: /cvs/ports/x11/freerdp/distinfo,v retrieving revision 1.7 diff -u -p -r1
Re: UPDATE: security/botan2
On Sat Jan 13, 2018 at 02:44:12PM +, Stuart Henderson wrote: > On 2018/01/13 14:40, Stuart Henderson wrote: > > On 2018/01/13 15:12, Rafael Sadowski wrote: > > > I run into the following GCC compile error. Any ideas? > > > > > % -> CC=egcc CXX=eg++ make -j8 > > > % ===> Building for botan2-2.4.0 > > > % eg++ -fstack-protector -m64 -pthread -mavx2 -fPIC -fvisibility=hidden > > > -std=c++11 -D_REENTRANT -O2 -pipe -Wall -Wextra -Wpedantic -Wshadow > > > -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -W > > > % missing-declarations -Wpointer-arith -Wcast-qual > > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include > > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include/external > > > -I/usr/local/includ > > > % e -c > > > /usr/ports/pobj/botan2-2.4.0/Botan-2.4.0/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp > > > -o > > > /usr/ports/pobj/botan2-2.4.0/build-amd64/build/obj/lib/block_threefish_avx2.o > > > % {standard input}: Assembler messages: > > > % {standard input}:26: Error: no such instruction: `vmovq 24(%r8),%xmm3' > > > % {standard input}:27: Error: no such instruction: `vpinsrq > > > $1,40(%r8),%xmm3,%xmm0' > > > % {standard input}:28: Error: no such instruction: `vmovq 8(%r8),%xmm1' > > > > > > % {standard input}:29: Error: no such instruction: `vmovq 64(%r8),%xmm6' > > > > > > % {standard input}:30: Error: no such instruction: `vpunpcklqdq > > > %xmm3,%xmm1,%xmm3' > > > % {standard input}:31: Error: no such instruction: `vpunpcklqdq > > > %xmm1,%xmm6,%xmm4' > > > % {standard input}:32: Error: no such instruction: `vinserti128 > > > $0x1,%xmm0,%ymm4,%ymm6' > > > % {standard input}:33: Error: no such instruction: `vmovdqa > > > %ymm6,-144(%rbp)' > > > % {standard input}:34: Error: no such instruction: `vmovq 32(%r8),%xmm6' > > > > > > % {standard input}:35: Error: no such instruction: `vpinsrq > > > $1,48(%r8),%xmm6,%xmm0' > > > % {standard input}:36: Error: no such instruction: `vmovq (%r8),%xmm6' > > > > > > % {standard input}:37: Error: no such instruction: `vpinsrq > > > $1,16(%r8),%xmm6,%xmm9' > > > % ... > > > > GCC uses binutils assembler, our version is too old to know these > > instructions. > > > > Clang has an integrated assembler. > > > > ...Also, I don't think the gcc -m options (like -mavx2 here) do a > cpuid check, if that's true they can't be used for ports. > Thanks for explaining. Well, then bye bye GCC arches :( Index: Makefile === RCS file: /cvs/ports/security/botan2/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile16 Nov 2017 23:20:40 - 1.11 +++ Makefile13 Jan 2018 18:31:53 - @@ -2,11 +2,11 @@ COMMENT = crypto and TLS for C++11 -VERSION = 2.3.0 +VERSION = 2.4.0 DISTNAME = Botan-${VERSION} PKGNAME = botan2-${VERSION} -SHARED_LIBS = botan-2 3.0 +SHARED_LIBS = botan-2 4.0 CATEGORIES = security @@ -17,8 +17,7 @@ MAINTAINER = Alexander Bluhm https://github.com/randombit/botan/commit/f492fbcca162209d2d87dff1dacdb66b566e10c1 - -Index: src/lib/prov/openssl/openssl_rsa.cpp src/lib/prov/openssl/openssl_rsa.cpp.orig -+++ src/lib/prov/openssl/openssl_rsa.cpp -@@ -15,6 +15,7 @@ - #include - #include - -+#include - #include - #include - Index: patches/patch-src_lib_utils_os_utils_cpp === RCS file: patches/patch-src_lib_utils_os_utils_cpp diff -N patches/patch-src_lib_utils_os_utils_cpp --- patches/patch-src_lib_utils_os_utils_cpp9 Oct 2017 20:05:07 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_lib_utils_os_utils_cpp,v 1.1 2017/10/09 20:05:07 bluhm Exp $ - -Index: src/lib/utils/os_utils.cpp src/lib/utils/os_utils.cpp.orig -+++ src/lib/utils/os_utils.cpp -@@ -10,7 +10,9 @@ - #include - #include - #include -+ - #include -+#include - - #if defined(BOTAN_HAS_BOOST_ASIO) - /* Index: patches/patch-src_tests_main_cpp === RCS file: /cvs/ports/security/botan2/patches/patch-src_tests_main_cpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_tests_main_cpp --- patches/patch-src_tests_main_cpp9 Oct 2017 20:05:07 - 1.2 +++ patches/patch-src_tests_main_cpp13 Jan 2018 18:31:53 - @@ -3,12 +3,12 @@ $OpenBSD: patch-src_tests_main_cpp,v 1.2 Index: src/tests/main.cpp --- src/tests/main.cpp.orig +++ src/tests/main.cpp -@@ -178,7 +178,7 @@ class Test_Runner final : public Botan_CLI::Command - const bool log_success = flag_set("log-success"); - const bool run_online_tests = flag_set("run-online-tests"); - const bool run_long_tests = flag_set("run-long-tests"); -- const std::string data_dir = get_arg_or
Re: [NEW] databases/tdbc-mysql
OK? > -- Original Message -- > From: Stuart Cassoff <3...@bell.net> > Date: December 24, 2017 at 11:46 PM > > > Now at version 1.0.6. > OK? > > > -- Original Message -- > > From: Stuart Cassoff <3...@bell.net> > > Date: December 6, 2017 at 1:03 AM > > > > > > Provides a database interface that conforms to Tcl DataBase Connectivity > > (TDBC) > > and allows a Tcl script to connect to a MariaDB database. > > > > Tested on i386 and amd64. > > > > OK? tdbc-mysql-1.0.6-port.tar.gz Description: application/gzip
[update] dunst-1.3.0
Hi, As mentioned, here's update to dunst to bring it to latest version. Also includes pledge tweak to fix the port when using icons in notifications. Quickly tested on amd64 where icons work. More tests would be welcome. Timo Index: Makefile === RCS file: /cvs/ports/x11/dunst/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile31 Aug 2017 20:57:00 - 1.3 +++ Makefile13 Jan 2018 15:18:53 - @@ -4,13 +4,13 @@ COMMENT= customizable and lightweight no GH_ACCOUNT = dunst-project GH_PROJECT = dunst -GH_TAGNAME = v1.2.0 +GH_TAGNAME = v1.3.0 CATEGORIES = x11 HOMEPAGE= https://dunst-project.org/ -MAINTAINER = Timo Myyra +MAINTAINER = Timo Myyra # BSD PERMIT_PACKAGE_CDROM= Yes Index: distinfo === RCS file: /cvs/ports/x11/dunst/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo31 Aug 2017 20:57:00 - 1.2 +++ distinfo13 Jan 2018 15:18:53 - @@ -1,2 +1,2 @@ -SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0= -SIZE (dunst-1.2.0.tar.gz) = 110628 +SHA256 (dunst-1.3.0.tar.gz) = dMCxFlz3qccfVivZdpeXBSjq5iXTTIcU+LmVG9XKW+Y= +SIZE (dunst-1.3.0.tar.gz) = 121499 Index: patches/patch-config_mk === RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v retrieving revision 1.2 diff -u -p -r1.2 patch-config_mk --- patches/patch-config_mk 31 Aug 2017 20:57:00 - 1.2 +++ patches/patch-config_mk 13 Jan 2018 15:18:53 - @@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/ Index: config.mk --- config.mk.orig +++ config.mk -@@ -28,7 +28,7 @@ endif +@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man # flags CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS} +CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${CPPFLAGS} + LDFLAGS += -lm -L${X11LIB} - pkg_config_packs := dbus-1 x11 xscrnsaver \ - "glib-2.0 >= 2.36" gio-2.0 \ + CPPFLAGS_DEBUG := -DDEBUG_BUILD Index: patches/patch-src_dunst_c === RCS file: /cvs/ports/x11/dunst/patches/patch-src_dunst_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_dunst_c --- patches/patch-src_dunst_c 31 Aug 2017 20:57:00 - 1.1 +++ patches/patch-src_dunst_c 13 Jan 2018 15:18:53 - @@ -3,23 +3,34 @@ $OpenBSD: patch-src_dunst_c,v 1.1 2017/0 Index: src/dunst.c --- src/dunst.c.orig +++ src/dunst.c -@@ -14,6 +14,9 @@ - #include - #include +@@ -5,12 +5,14 @@ + #include "dunst.h" + #include +#include + #include + #include + #include + #include + #include + #include +#include -+ + #include "dbus.h" #include "menu.h" - #include "notification.h" -@@ -325,6 +328,9 @@ int dunst_main(int argc, char *argv[]) - int owner_id = initdbus(); - - x_setup(); -+ -+if (pledge("stdio rpath proc exec", NULL) == -1) -+err(1, "pledge"); +@@ -193,6 +195,15 @@ int dunst_main(int argc, char *argv[]) + * graceful termination */ + guint term_src = g_unix_signal_add(SIGTERM, quit_signal, NULL); + guint int_src = g_unix_signal_add(SIGINT, quit_signal, NULL); ++ ++/* allow prot_exec if icons are used */ ++if (settings.icon_position != icons_off) { ++if (pledge("stdio rpath proc exec prot_exec", NULL) == -1) ++err(1, "pledge"); ++} else { ++if (pledge("stdio rpath proc exec", NULL) == -1) ++err(1, "pledge"); ++} - if (settings.startup_notification) { - notification *n = notification_create(); + run(NULL); + g_main_loop_run(mainloop); Index: patches/patch-src_menu_c === RCS file: /cvs/ports/x11/dunst/patches/patch-src_menu_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_menu_c --- patches/patch-src_menu_c31 Aug 2017 20:57:00 - 1.1 +++ patches/patch-src_menu_c13 Jan 2018 15:18:53 - @@ -11,7 +11,7 @@ Index: src/menu.c -"\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)" -"[-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*" - "(\\([-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*\\)|[-[:alnum:]_\\@;/?:&=%$+*~])+"; -+ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]"; ++char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]"; int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE); if (ret != 0) { fputs("failed to compile regex", stderr);
glib2: gio kqueue fixes
Diff below is a redesign of the kqueue(2) backend for GIO/glib. It fixes BZ #739424 and a couple of more bugs and races & reduces the size of the backend by 1K+ lines. The backend is still not generating all the events it should, but that's a different problem. More details about my work can be found in the git commit below. I'd appreciate test reports before I push that upstream. Index: Makefile === RCS file: /cvs/ports/devel/glib2/Makefile,v retrieving revision 1.268 diff -u -p -r1.268 Makefile --- Makefile9 Jan 2018 12:31:54 - 1.268 +++ Makefile13 Jan 2018 14:55:24 - @@ -9,6 +9,7 @@ COMMENT=general-purpose utility librar GNOME_PROJECT= glib GNOME_VERSION= 2.54.3 PKGNAME= ${DISTNAME:S/glib/glib2/} +REVISION= 0 CATEGORIES=devel @@ -54,6 +55,12 @@ CONFIGURE_ARGS= --enable-static \ --with-pcre=system \ --disable-fam +AUTOCONF_VERSION= 2.69 +AUTOMAKE_VERSION= 1.15 +BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/libtool + .include .if ${PROPERTIES:Mgcc3} PATCH_LIST=patch-* gcc3-* @@ -71,5 +78,9 @@ pre-configure: sed -i "s,/usr/share,${PREFIX}/share,g" \ ${WRKSRC}/docs/reference/gio/html/glib-compile-schemas.html \ ${WRKSRC}/docs/reference/gio/glib-compile-schemas.xml + cd ${WRKSRC} && env -i \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + autoreconf -fi .include Index: patches/patch-gio_kqueue_gkqueuefilemonitor_c === RCS file: patches/patch-gio_kqueue_gkqueuefilemonitor_c diff -N patches/patch-gio_kqueue_gkqueuefilemonitor_c --- patches/patch-gio_kqueue_gkqueuefilemonitor_c 8 May 2017 16:57:08 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,50 +0,0 @@ -$OpenBSD: patch-gio_kqueue_gkqueuefilemonitor_c,v 1.2 2017/05/08 16:57:08 ajacoutot Exp $ - -Prevent a use-after-free resulting in a crash of all apps depending -on glib/GIO mostly at "pkg_add -u" time. -https://bugzilla.gnome.org/show_bug.cgi?id=739424 - -Index: gio/kqueue/gkqueuefilemonitor.c gio/kqueue/gkqueuefilemonitor.c.orig -+++ gio/kqueue/gkqueuefilemonitor.c -@@ -30,6 +30,16 @@ - #include - - -+/* -+ * Because `kqueue_sub'' are not refcounted, we need -+ * ensure no other thread is getting a reference to -+ * the element we want to free. -+ * -+ * That's why _kh_cancel_sub() must be called with -+ * this lock held to prevent a race. -+ */ -+G_LOCK_EXTERN (hash_lock); -+ - struct _GKqueueFileMonitor - { - GLocalFileMonitor parent_instance; -@@ -80,9 +90,11 @@ g_kqueue_file_monitor_finalize (GObject *object) - - if (kqueue_monitor->sub) - { -+ G_LOCK (hash_lock); - _kh_cancel_sub (kqueue_monitor->sub); - _kh_sub_free (kqueue_monitor->sub); - kqueue_monitor->sub = NULL; -+ G_UNLOCK (hash_lock); - } - - if (kqueue_monitor->fallback) -@@ -181,9 +193,11 @@ g_kqueue_file_monitor_cancel (GFileMonitor *monitor) - - if (kqueue_monitor->sub) - { -+ G_LOCK (hash_lock); - _kh_cancel_sub (kqueue_monitor->sub); - _kh_sub_free (kqueue_monitor->sub); - kqueue_monitor->sub = NULL; -+ G_UNLOCK (hash_lock); - } - else if (kqueue_monitor->fallback) - { Index: patches/patch-gio_kqueue_kqueue-helper_c === RCS file: patches/patch-gio_kqueue_kqueue-helper_c diff -N patches/patch-gio_kqueue_kqueue-helper_c --- patches/patch-gio_kqueue_kqueue-helper_c9 Jan 2018 12:31:54 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,64 +0,0 @@ -$OpenBSD: patch-gio_kqueue_kqueue-helper_c,v 1.4 2018/01/09 12:31:54 ajacoutot Exp $ - -Prevent a use-after-free resulting in a crash of all apps depending -on glib/GIO mostly at "pkg_add -u" time. -https://bugzilla.gnome.org/show_bug.cgi?id=739424 - -Index: gio/kqueue/kqueue-helper.c gio/kqueue/kqueue-helper.c.orig -+++ gio/kqueue/kqueue-helper.c -@@ -43,7 +43,7 @@ static gboolean kh_debug_enabled = FALSE; - #define KH_W if (kh_debug_enabled) g_warning - - static GHashTable *subs_hash_table = NULL; --G_LOCK_DEFINE_STATIC (hash_lock); -+G_LOCK_DEFINE (hash_lock); - - static int kqueue_descriptor = -1; - static int kqueue_socket_pair[] = {-1, -1}; -@@ -293,10 +293,10 @@ process_kqueue_notifications (GIOChannel *gioc, - - G_LOCK (hash_lock); - sub = (kqueue_sub *) g_hash_table_lookup (subs_hash_table, GINT_TO_POINTER (n.fd)); -- G_UNLOCK (hash_lock); - - if (sub == NULL) - { -+ G_UNLOCK (hash_lock); - KH_W ("Got a notification for a deleted or non-existing subscription %d", - n.fd);
Re: UPDATE: security/botan2
On 2018/01/13 14:40, Stuart Henderson wrote: > On 2018/01/13 15:12, Rafael Sadowski wrote: > > I run into the following GCC compile error. Any ideas? > > > % -> CC=egcc CXX=eg++ make -j8 > > % ===> Building for botan2-2.4.0 > > % eg++ -fstack-protector -m64 -pthread -mavx2 -fPIC -fvisibility=hidden > > -std=c++11 -D_REENTRANT -O2 -pipe -Wall -Wextra -Wpedantic -Wshadow > > -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -W > > % missing-declarations -Wpointer-arith -Wcast-qual > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include > > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include/external > > -I/usr/local/includ > > % e -c > > /usr/ports/pobj/botan2-2.4.0/Botan-2.4.0/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp > > -o > > /usr/ports/pobj/botan2-2.4.0/build-amd64/build/obj/lib/block_threefish_avx2.o > > % {standard input}: Assembler messages: > > % {standard input}:26: Error: no such instruction: `vmovq 24(%r8),%xmm3' > > % {standard input}:27: Error: no such instruction: `vpinsrq > > $1,40(%r8),%xmm3,%xmm0' > > % {standard input}:28: Error: no such instruction: `vmovq 8(%r8),%xmm1' > > > > % {standard input}:29: Error: no such instruction: `vmovq 64(%r8),%xmm6' > > > > % {standard input}:30: Error: no such instruction: `vpunpcklqdq > > %xmm3,%xmm1,%xmm3' > > % {standard input}:31: Error: no such instruction: `vpunpcklqdq > > %xmm1,%xmm6,%xmm4' > > % {standard input}:32: Error: no such instruction: `vinserti128 > > $0x1,%xmm0,%ymm4,%ymm6' > > % {standard input}:33: Error: no such instruction: `vmovdqa > > %ymm6,-144(%rbp)' > > % {standard input}:34: Error: no such instruction: `vmovq 32(%r8),%xmm6' > > > > % {standard input}:35: Error: no such instruction: `vpinsrq > > $1,48(%r8),%xmm6,%xmm0' > > % {standard input}:36: Error: no such instruction: `vmovq (%r8),%xmm6' > > > > % {standard input}:37: Error: no such instruction: `vpinsrq > > $1,16(%r8),%xmm6,%xmm9' > > % ... > > GCC uses binutils assembler, our version is too old to know these > instructions. > > Clang has an integrated assembler. > ...Also, I don't think the gcc -m options (like -mavx2 here) do a cpuid check, if that's true they can't be used for ports.
Re: UPDATE: security/botan2
On 2018/01/13 15:12, Rafael Sadowski wrote: > I run into the following GCC compile error. Any ideas? > % -> CC=egcc CXX=eg++ make -j8 > % ===> Building for botan2-2.4.0 > % eg++ -fstack-protector -m64 -pthread -mavx2 -fPIC -fvisibility=hidden > -std=c++11 -D_REENTRANT -O2 -pipe -Wall -Wextra -Wpedantic -Wshadow > -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -W > % missing-declarations -Wpointer-arith -Wcast-qual > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include > -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include/external > -I/usr/local/includ > % e -c > /usr/ports/pobj/botan2-2.4.0/Botan-2.4.0/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp > -o > /usr/ports/pobj/botan2-2.4.0/build-amd64/build/obj/lib/block_threefish_avx2.o > % {standard input}: Assembler messages: > % {standard input}:26: Error: no such instruction: `vmovq 24(%r8),%xmm3' > % {standard input}:27: Error: no such instruction: `vpinsrq > $1,40(%r8),%xmm3,%xmm0' > % {standard input}:28: Error: no such instruction: `vmovq 8(%r8),%xmm1' > > % {standard input}:29: Error: no such instruction: `vmovq 64(%r8),%xmm6' > > % {standard input}:30: Error: no such instruction: `vpunpcklqdq > %xmm3,%xmm1,%xmm3' > % {standard input}:31: Error: no such instruction: `vpunpcklqdq > %xmm1,%xmm6,%xmm4' > % {standard input}:32: Error: no such instruction: `vinserti128 > $0x1,%xmm0,%ymm4,%ymm6' > % {standard input}:33: Error: no such instruction: `vmovdqa %ymm6,-144(%rbp)' > > % {standard input}:34: Error: no such instruction: `vmovq 32(%r8),%xmm6' > > % {standard input}:35: Error: no such instruction: `vpinsrq > $1,48(%r8),%xmm6,%xmm0' > % {standard input}:36: Error: no such instruction: `vmovq (%r8),%xmm6' > > % {standard input}:37: Error: no such instruction: `vpinsrq > $1,16(%r8),%xmm6,%xmm9' > % ... GCC uses binutils assembler, our version is too old to know these instructions. Clang has an integrated assembler.
Re: [pledge update] dunst-1.2.0p0
I don't know if it matters, but we usually have if ... pledge("some list"... else ... pledge("other list"... rather than using a variable. On 2018/01/13 16:14, Timo Myyrä wrote: > Hi, > > Re-sending diff to update my email and fixing the pledge in dunst when using > icons. > > timo > > Index: Makefile > === > RCS file: /cvs/ports/x11/dunst/Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 Makefile > --- Makefile 31 Aug 2017 20:57:00 - 1.3 > +++ Makefile 17 Dec 2017 15:13:56 - > @@ -5,12 +5,13 @@ COMMENT=customizable and lightweight no > GH_ACCOUNT = dunst-project > GH_PROJECT = dunst > GH_TAGNAME = v1.2.0 > +REVISION = 0 > > CATEGORIES = x11 > > HOMEPAGE=https://dunst-project.org/ > > -MAINTAINER = Timo Myyra > +MAINTAINER = Timo Myyra > > # BSD > PERMIT_PACKAGE_CDROM=Yes > Index: patches/patch-src_dunst_c > === > RCS file: /cvs/ports/x11/dunst/patches/patch-src_dunst_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-src_dunst_c > --- patches/patch-src_dunst_c 31 Aug 2017 20:57:00 - 1.1 > +++ patches/patch-src_dunst_c 17 Dec 2017 15:13:56 - > @@ -13,13 +13,21 @@ Index: src/dunst.c > #include "dbus.h" > #include "menu.h" > #include "notification.h" > -@@ -325,6 +328,9 @@ int dunst_main(int argc, char *argv[]) > - int owner_id = initdbus(); > - > - x_setup(); > -+ > -+if (pledge("stdio rpath proc exec", NULL) == -1) > +@@ -368,6 +371,17 @@ int dunst_main(int argc, char *argv[]) > + * graceful termination */ > + guint term_src = g_unix_signal_add(SIGTERM, quit_signal, NULL); > + guint int_src = g_unix_signal_add(SIGINT, quit_signal, NULL); > ++ > ++/* allow prot_exec if icons are used */ > ++char *pledge_str; > ++if (settings.icon_position != icons_off) { > ++pledge_str = "stdio rpath proc exec prot_exec"; > ++} else { > ++pledge_str = "stdio rpath proc exec"; > ++} > ++ > ++if (pledge(pledge_str, NULL) == -1) > +err(1, "pledge"); > > - if (settings.startup_notification) { > - notification *n = notification_create(); > + run(NULL); > + g_main_loop_run(mainloop); >
Re: [pledge update] dunst-1.2.0p0
timo.my...@bittivirhe.fi (Timo Myyrä) writes: > Hi, > > Re-sending diff to update my email and fixing the pledge in dunst when using > icons. > > timo > > Index: Makefile > === > RCS file: /cvs/ports/x11/dunst/Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 Makefile > --- Makefile 31 Aug 2017 20:57:00 - 1.3 > +++ Makefile 17 Dec 2017 15:13:56 - > @@ -5,12 +5,13 @@ COMMENT=customizable and lightweight no > GH_ACCOUNT = dunst-project > GH_PROJECT = dunst > GH_TAGNAME = v1.2.0 > +REVISION = 0 > > CATEGORIES = x11 > > HOMEPAGE=https://dunst-project.org/ > > -MAINTAINER = Timo Myyra > +MAINTAINER = Timo Myyra > > # BSD > PERMIT_PACKAGE_CDROM=Yes > Index: patches/patch-src_dunst_c > === > RCS file: /cvs/ports/x11/dunst/patches/patch-src_dunst_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-src_dunst_c > --- patches/patch-src_dunst_c 31 Aug 2017 20:57:00 - 1.1 > +++ patches/patch-src_dunst_c 17 Dec 2017 15:13:56 - > @@ -13,13 +13,21 @@ Index: src/dunst.c > #include "dbus.h" > #include "menu.h" > #include "notification.h" > -@@ -325,6 +328,9 @@ int dunst_main(int argc, char *argv[]) > - int owner_id = initdbus(); > - > - x_setup(); > -+ > -+if (pledge("stdio rpath proc exec", NULL) == -1) > +@@ -368,6 +371,17 @@ int dunst_main(int argc, char *argv[]) > + * graceful termination */ > + guint term_src = g_unix_signal_add(SIGTERM, quit_signal, NULL); > + guint int_src = g_unix_signal_add(SIGINT, quit_signal, NULL); > ++ > ++/* allow prot_exec if icons are used */ > ++char *pledge_str; > ++if (settings.icon_position != icons_off) { > ++pledge_str = "stdio rpath proc exec prot_exec"; > ++} else { > ++pledge_str = "stdio rpath proc exec"; > ++} > ++ > ++if (pledge(pledge_str, NULL) == -1) > +err(1, "pledge"); > > - if (settings.startup_notification) { > - notification *n = notification_create(); > + run(NULL); > + g_main_loop_run(mainloop); Hmm, seems 1.3.0 was released recently. I'll cook a diff to update to that rather than just patch previous release. Timo
[pledge update] dunst-1.2.0p0
Hi, Re-sending diff to update my email and fixing the pledge in dunst when using icons. timo Index: Makefile === RCS file: /cvs/ports/x11/dunst/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile31 Aug 2017 20:57:00 - 1.3 +++ Makefile17 Dec 2017 15:13:56 - @@ -5,12 +5,13 @@ COMMENT= customizable and lightweight no GH_ACCOUNT = dunst-project GH_PROJECT = dunst GH_TAGNAME = v1.2.0 +REVISION = 0 CATEGORIES = x11 HOMEPAGE= https://dunst-project.org/ -MAINTAINER = Timo Myyra +MAINTAINER = Timo Myyra # BSD PERMIT_PACKAGE_CDROM= Yes Index: patches/patch-src_dunst_c === RCS file: /cvs/ports/x11/dunst/patches/patch-src_dunst_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_dunst_c --- patches/patch-src_dunst_c 31 Aug 2017 20:57:00 - 1.1 +++ patches/patch-src_dunst_c 17 Dec 2017 15:13:56 - @@ -13,13 +13,21 @@ Index: src/dunst.c #include "dbus.h" #include "menu.h" #include "notification.h" -@@ -325,6 +328,9 @@ int dunst_main(int argc, char *argv[]) - int owner_id = initdbus(); - - x_setup(); -+ -+if (pledge("stdio rpath proc exec", NULL) == -1) +@@ -368,6 +371,17 @@ int dunst_main(int argc, char *argv[]) + * graceful termination */ + guint term_src = g_unix_signal_add(SIGTERM, quit_signal, NULL); + guint int_src = g_unix_signal_add(SIGINT, quit_signal, NULL); ++ ++/* allow prot_exec if icons are used */ ++char *pledge_str; ++if (settings.icon_position != icons_off) { ++pledge_str = "stdio rpath proc exec prot_exec"; ++} else { ++pledge_str = "stdio rpath proc exec"; ++} ++ ++if (pledge(pledge_str, NULL) == -1) +err(1, "pledge"); - if (settings.startup_notification) { - notification *n = notification_create(); + run(NULL); + g_main_loop_run(mainloop);
Re: UPDATE: security/botan2
On Thu Jan 11, 2018 at 02:03:19AM +0100, Alexander Bluhm wrote: > On Wed, Jan 10, 2018 at 10:24:45PM +0100, Rafael Sadowski wrote: > > -MAINTAINER = Alexander Bluhm > > +MAINTAINER = Alexander Bluhm > > Makefile.template has two tabs here. You're right. > > > Index: patches/patch-src_build-data_cc_gcc_txt > > === > > RCS file: > > /cvs/ports/security/botan2/patches/patch-src_build-data_cc_gcc_txt,v > > retrieving revision 1.1.1.1 > > diff -u -p -u -p -r1.1.1.1 patch-src_build-data_cc_gcc_txt > > --- patches/patch-src_build-data_cc_gcc_txt 13 Mar 2017 15:00:39 - > > 1.1.1.1 > > +++ patches/patch-src_build-data_cc_gcc_txt 10 Jan 2018 21:20:28 - > > @@ -1,20 +1,13 @@ > > $OpenBSD: patch-src_build-data_cc_gcc_txt,v 1.1.1.1 2017/03/13 15:00:39 > > bluhm Exp $ > > src/build-data/cc/gcc.txt.orig Tue Jan 10 04:21:31 2017 > > -+++ src/build-data/cc/gcc.txt Mon Mar 13 07:14:45 2017 > > -@@ -1,6 +1,6 @@ > > - macro_name GCC > > +Index: src/build-data/cc/gcc.txt > > +--- src/build-data/cc/gcc.txt.orig > > src/build-data/cc/gcc.txt > > +@@ -9,7 +9,7 @@ warning_flags "-Wall -Wextra -Wpedantic -Wstrict-alias > > > > --binary_name g++ > > -+binary_name ${CXX} > > Why do you remove this? fixed; > > > + maintainer_warning_flags "-Wstrict-overflow=5 -Wold-style-cast > > -Wsuggest-override -Wshadow -Werror -Wno-error=strict-overflow > > -Wno-error=deprecated-declarations" > > > > - output_to_option "-o " > > - add_include_dir_option -I > > -@@ -16,7 +16,7 @@ maintainer_warning_flags "-Wold-style-cast -Wsuggest-o > > - > > - compile_flags "-c" > > - debug_info_flags "-g" > > -optimization_flags "-O3" > > -+optimization_flags "${CXXFLAGS}" > > ++optimization_flags "" > > Should this be ${CXXFLAGS}? Have you tested it on a non clang > architecture? fixed; No gcc.txt changes. > > > Index: patches/patch-src_lib_prov_openssl_openssl_rsa_cpp > > === > > RCS file: > > /cvs/ports/security/botan2/patches/patch-src_lib_prov_openssl_openssl_rsa_cpp,v > > retrieving revision 1.1 > > diff -u -p -u -p -r1.1 patch-src_lib_prov_openssl_openssl_rsa_cpp > > --- patches/patch-src_lib_prov_openssl_openssl_rsa_cpp 9 Oct 2017 > > 20:05:07 - 1.1 > > +++ patches/patch-src_lib_prov_openssl_openssl_rsa_cpp 10 Jan 2018 > > 21:20:28 - > > @@ -12,4 +12,4 @@ Index: src/lib/prov/openssl/openssl_rsa. > > +#include > > #include > > #include > > - > > + #include > > Do we need cstdlib twice? I think you should remove this patch. fixed; > > bluhm > Changes to the previous diff - fixed changes above - regen WANTLIB I run into the following GCC compile error. Any ideas? % -> CC=egcc CXX=eg++ make -j8 % ===> Building for botan2-2.4.0 % eg++ -fstack-protector -m64 -pthread -mavx2 -fPIC -fvisibility=hidden -std=c++11 -D_REENTRANT -O2 -pipe -Wall -Wextra -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -W % missing-declarations -Wpointer-arith -Wcast-qual -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include -I/usr/ports/pobj/botan2-2.4.0/build-amd64/build/include/external -I/usr/local/includ % e -c /usr/ports/pobj/botan2-2.4.0/Botan-2.4.0/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp -o /usr/ports/pobj/botan2-2.4.0/build-amd64/build/obj/lib/block_threefish_avx2.o % {standard input}: Assembler messages: % {standard input}:26: Error: no such instruction: `vmovq 24(%r8),%xmm3' % {standard input}:27: Error: no such instruction: `vpinsrq $1,40(%r8),%xmm3,%xmm0' % {standard input}:28: Error: no such instruction: `vmovq 8(%r8),%xmm1' % {standard input}:29: Error: no such instruction: `vmovq 64(%r8),%xmm6' % {standard input}:30: Error: no such instruction: `vpunpcklqdq %xmm3,%xmm1,%xmm3' % {standard input}:31: Error: no such instruction: `vpunpcklqdq %xmm1,%xmm6,%xmm4' % {standard input}:32: Error: no such instruction: `vinserti128 $0x1,%xmm0,%ymm4,%ymm6' % {standard input}:33: Error: no such instruction: `vmovdqa %ymm6,-144(%rbp)' % {standard input}:34: Error: no such instruction: `vmovq 32(%r8),%xmm6' % {standard input}:35: Error: no such instruction: `vpinsrq $1,48(%r8),%xmm6,%xmm0' % {standard input}:36: Error: no such instruction: `vmovq (%r8),%xmm6' % {standard input}:37: Error: no such instruction: `vpinsrq $1,16(%r8),%xmm6,%xmm9' % ... Best regards, Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/security/botan2/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile16 Nov 2017 23:20:40 - 1.11 +++ Makefile13 Jan 2018 13:57:07 - @@ -2,11 +2,11 @@ COMMENT = crypto and TLS for C++11 -VERSION = 2.3.0 +VERSION = 2.4.0 DISTNAME
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
On 2018/01/13 14:11, Sebastien Marie wrote: > I didn't check RUN_DEPENDS, as I didn't expect command-line change. I wouldn't put it past them to chage command-line again ;) > +WANTLIB += ossaudio I don't _think_ we don't want that.. -DWITH_OSS=OFF ? Build fails for me, it tries to use -lrt. FAILED: client/X11/xfreerdp : && /usr/local/bin/ccache /usr/obj/ports/freerdp-2.0.0rc1/bin/cc -O2 -pipe -I/usr/X11R6/include -I/usr/local/include -Wno-unused-parameter -Wno-unused-macros -Wno-padded -Wno-c11-extensions -Wno-gnu -Wno-unused-command-line-argument -Wno-deprecated-declarations -DNDEBUG client/X11/CMakeFiles/xfreerdp-client.dir/xf_gdi.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_gfx.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_rail.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_tsmf.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_input.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_event.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_channels.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_cliprdr.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_monitor.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_graphics.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_keyboard.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_window.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_client.c.o client/X11/CMakeFiles/xfreerdp-client.dir/cli/xfreerdp.c.o -o client/X11/xfreerdp -L/usr/local/lib -L/usr/X11R6/lib -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/client/common -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/libfreerdp -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/winpr/libwinpr -Wl,-rpath,/usr/local/lib:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/client/common:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/libfreerdp:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/winpr/libwinpr: -lX11 -lXinerama -lXext -lXcursor -lXv -lXi -lXrender -lXfixes -lfreerdp-client2 -lfreerdp2 -lm -lrt -lwinpr2 -lossaudio -Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && : /usr/bin/ld: cannot find -lrt
update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
Hi, The freerdp version we have in repository is quite old now (the GH_COMMIT is from Sep 11, 2014), and channel-drive (fact to share a directory with the server) is disabled due to compilation problem. So I tried to update it, and as upstream has a particular way to make release (latest "normal" release is from 2013), I followed the last tag which is 2.0.0-rc1. - lot of patches are upstreamed, and I only had to patch some LIBRESSL stuff (no FIPS mode). - in Makefile, I cleanup CONFIGURE_ARGS that are default for OpenBSD (no alsa, no pulse, ...) Also, the switch is from 1.2.0beta1 to 2.0.0rc1 and libfreerdp.so changed to libfreerdp2.so I had to adapt the dependencies: - x11/remmina : same upstream (and same funny release mode), so I updated to 1.2.0rc26 (the current 1.1.2 is from Dec 8, 2014). - x11/gnome/vinagre : doesn't support libfreerdp2 out-of-box, so I cheated a bit (patches are really small and not invasive: only configure detection and a function to patch). I didn't check RUN_DEPENDS, as I didn't expect command-line change. freerdp was tested (build + runtime) on amd64. others have been only built on i386. runtime tests for remmina and vinagre would be welcome (but I will do some of them on i386). Thanks. -- Sebastien Marie Index: x11/freerdp/Makefile === RCS file: /cvs/ports/x11/freerdp/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- x11/freerdp/Makefile9 Nov 2017 16:50:39 - 1.29 +++ x11/freerdp/Makefile13 Jan 2018 13:07:44 - @@ -5,18 +5,17 @@ BROKEN-arm = unrecognized option -mfpu= BROKEN-hppa = undefined reference to __sync_val_compare_and_swap_4 COMMENT = open source client for Windows Terminal Server -DISTNAME = freerdp-1.2.0beta1 +DISTNAME = freerdp-2.0.0rc1 CATEGORIES = x11 net -REVISION = 2 GH_ACCOUNT = FreeRDP GH_PROJECT = FreeRDP -GH_COMMIT =f5ff6e1bd819a347aa532c1ef1a9cf0c67387507 +GH_TAGNAME = 2.0.0-rc1 -SHARED_LIBS += freerdp-client0.0 # 1.2 -SHARED_LIBS += freerdp 0.0 # 1.2 -SHARED_LIBS += winpr 0.0 # 1.1 -SHARED_LIBS += xfreerdp-client 0.0 # 1.2 +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 HOMEPAGE = http://www.freerdp.com/ @@ -25,7 +24,7 @@ PERMIT_PACKAGE_CDROM =Yes WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile -WANTLIB += z +WANTLIB += ossaudio MODULES = devel/cmake @@ -38,20 +37,13 @@ LIB_DEPENDS = devel/libexecinfo \ print/cups,-libs \ graphics/ffmpeg -CONFIGURE_ARGS += -DWITH_ALSA=OFF \ - -DWITH_CUPS=ON \ +CONFIGURE_ARGS += -DWITH_CUPS=ON \ -DWITH_DIRECTFB=OFF \ -DWITH_GSTREAMER_0_10=OFF \ -DWITH_GSTREAMER_1_0=OFF \ -DWITH_OPENSLES=OFF \ -DWITH_PCSC=ON \ - -DWITH_PULSE=OFF - -# XXX does not build -CONFIGURE_ARGS += -DCHANNEL_DRIVE=OFF - -# -msse3 requires a newer gcc -CONFIGURE_ARGS += -DWITH_SSE2=OFF + -DWITH_LIBSYSTEMD=OFF NO_TEST = Yes Index: x11/freerdp/distinfo === RCS file: /cvs/ports/x11/freerdp/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- x11/freerdp/distinfo6 May 2017 15:10:18 - 1.7 +++ x11/freerdp/distinfo13 Jan 2018 13:07:44 - @@ -1,2 +1,2 @@ -SHA256 (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = /LC7jfaSVy4Bmye9sljZvhOW/pOAerJ3Ld4vC7JqxVY= -SIZE (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = 6036392 +SHA256 (freerdp-2.0.0rc1.tar.gz) = osHIMHJInVbaeLvnbClykCL1w1o+w6HOJs6ogj3gQ8I= +SIZE (freerdp-2.0.0rc1.tar.gz) = 6530403 Index: x11/freerdp/patches/patch-CMakeLists_txt === RCS file: x11/freerdp/patches/patch-CMakeLists_txt diff -N x11/freerdp/patches/patch-CMakeLists_txt --- x11/freerdp/patches/patch-CMakeLists_txt7 Nov 2015 05:55:08 - 1.5 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,54 +0,0 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.5 2015/11/07 05:55:08 ajacoutot Exp $ CMakeLists.txt.origFri Sep 12 00:46:32 2014 -+++ CMakeLists.txt Fri Nov 6 19:29:28 2015 -@@ -170,20 +170,9 @@ if(CMAKE_COMPILER_IS_GNUCC) - if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG") - set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG") -- s
Re: NEW: piglit - testing suite for OpenGL
On 2018/01/12 14:40, Thomas Frohwein wrote: > Hi, > > Attached is a port of piglit. Piglit is a freedesktop.org testing suite for > OpenGL calls. It may be of use in trying to troubleshoot regressions with > mesa, > OpenGL, and the graphics stack in general. > > I've done some tests with different configurations myself since I have one of > the x230 affected by the recent mesa17 issues. The results can be downloaded > from https://thfr.info/piglit/openbsd-mesa17/. Note that those were done with > piglit compiled from FreeBSD's separate github repository (https://github.com/ > dumbbell/piglit/) while this port is from the mesa3d github repo. Runs, passes > sanity check. > > License includes a 3Dlabs license that doesn't comment on selling, so I set > > PERMIT_PACKAGE_CDROM = No comment on selling by 3Dlabs license > PERMIT_PACKAGE_FTP =Yes > > A word of warning - the PLIST is huge - greater than 5M. > > I'd prefer to not take maintainer on this one because the actually working > with the results is a little beyond my capabilities. > > Original idea from Matthieu Herrb. Input included from sthen@, awolk@, > bcallah@. Advice received from medfly and joshe (on #metabug). Minor nit, _MODPY_BUILD_DEPENDS is meant to be internal to python.port.mk (typically variables starting _ are for internal use) and is added to BUILD_DEPENDS automatically, no need to add it separately. Other than that I think this is good to go, any OKs to import?