FIX: graphics/pdfmod -- We no longer ship Mono3
Hi ports --
graphics/pdfmod includes a patch specifically for Mono3. We don't
ship Mono3 any more. This patch was added in r1.16. These days,
pdfmod builds and runs fine without this patch.
Diff removes it; also removes gpatch as a dependency. Note that
the line changing gmcs to dmcs stays. Mono 6.8 says that dmcs is
deprecated but that can be dealt with another day.
Discovered when build testing all ports dependent on gpatch.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/graphics/pdfmod/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 12 Jul 2019 20:47:07 - 1.21
+++ Makefile 30 May 2020 23:53:46 -
@@ -4,7 +4,7 @@ COMMENT= simple application for modifyin
GNOME_PROJECT= pdfmod
GNOME_VERSION= 0.9.1
-REVISION= 7
+REVISION= 8
CATEGORIES= graphics print
@@ -30,14 +30,7 @@ CONFIGURE_ARGS= --enable-release \
DLLMAP_FILES= lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config
-### build with Mono3
-PATCHFILES= pdfmod-mono3.patch:0
-PATCH_DIST_STRIP= -p1
-MASTER_SITES0= https://distfiles.bsdfrog.org/
-BUILD_DEPENDS += devel/gpatch
-PATCH= ${LOCALBASE}/bin/gpatch
pre-configure:
sed -i 's,gmcs,dmcs,g' ${WRKSRC}/configure
-###
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/pdfmod/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 23 Jul 2014 09:01:24 - 1.2
+++ distinfo 30 May 2020 23:53:46 -
@@ -1,4 +1,2 @@
SHA256 (pdfmod-0.9.1.tar.bz2) = 63yYdRSgUxBt3wPyZUR2bHUcgB2HdikJs2QV1GvEJck=
-SHA256 (pdfmod-mono3.patch) = FV+WX++vnMMYEHmV6drgKznLnDU3Gfnqs6MnVVVvLDY=
SIZE (pdfmod-0.9.1.tar.bz2) = 667450
-SIZE (pdfmod-mono3.patch) = 2480
Fix GNU patch CVE-2018-1000156
Hi ports --
repology.org has a new feature where it tracks the CVEs against its
database of software. I decided to check it out to see if any of my
ports were vulnerable. I discovered that our GNU patch is vulnerable
to CVE-2018-1000156. It has been fixed upstream but no new release
has been made including the fix. So I cherry-picked it for our
package.
Upstream does have a test with it, but adding the test to the build
would bring in a dependency on autotools, so I left it out but I did
confirm that the test passes on amd64 and sparc64.
Tested on amd64 and sparc64. Additionally, on amd64 I built
everything that depends on gpatch. Libreoffice is still building;
will report back if it fails to build.
Should this be backported to -stable?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/devel/gpatch/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 16 Jul 2019 21:29:41 - 1.10
+++ Makefile 31 May 2020 01:05:37 -
@@ -6,7 +6,7 @@ VERSION= 2.7.6
DISTNAME= patch-${VERSION}
PKGNAME= gpatch-${VERSION}
CATEGORIES= devel
-REVISION= 0
+REVISION= 1
HOMEPAGE= https://www.gnu.org/software/patch/
Index: patches/patch-src_pch_c
===
RCS file: patches/patch-src_pch_c
diff -N patches/patch-src_pch_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_pch_c 31 May 2020 01:05:37 -
@@ -0,0 +1,140 @@
+$OpenBSD$
+
+https://nvd.nist.gov/vuln/detail/CVE-2018-1000156
+
+Index: src/pch.c
+--- src/pch.c.orig
src/pch.c
+@@ -33,6 +33,7 @@
+ # include
+ #endif
+ #include
++#include
+
+ #define INITHUNKMAX 125 /* initial dynamic allocation size */
+
+@@ -974,7 +975,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_typ
+ if ((pch_rename () || pch_copy ())
+ && ! inname
+ && ! ((i == OLD || i == NEW) &&
+- p_name[! reverse] &&
++ p_name[reverse] && p_name[! reverse] &&
++ name_is_valid (p_name[reverse]) &&
+ name_is_valid (p_name[! reverse])))
+ {
+ say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
+@@ -2388,22 +2390,28 @@ do_ed_script (char const *inname, char const *outname,
+ static char const editor_program[] = EDITOR_PROGRAM;
+
+ file_offset beginning_of_this_line;
+-FILE *pipefp = 0;
+ size_t chars_read;
++FILE *tmpfp = 0;
++char const *tmpname;
++int tmpfd;
++pid_t pid;
+
+-if (! dry_run && ! skip_rest_of_patch) {
+- int exclusive = *outname_needs_removal ? 0 : O_EXCL;
+- assert (! inerrno);
+- *outname_needs_removal = true;
+- copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
+- sprintf (buf, "%s %s%s", editor_program,
+- verbosity == VERBOSE ? "" : "- ",
+- outname);
+- fflush (stdout);
+- pipefp = popen(buf, binary_transput ? "wb" : "w");
+- if (!pipefp)
+- pfatal ("Can't open pipe to %s", quotearg (buf));
+-}
++if (! dry_run && ! skip_rest_of_patch)
++ {
++ /* Write ed script to a temporary file. This causes ed to abort on
++ invalid commands such as when line numbers or ranges exceed the
++ number of available lines. When ed reads from a pipe, it rejects
++ invalid commands and treats the next line as a new command, which
++ can lead to arbitrary command execution. */
++
++ tmpfd = make_tempfile (, 'e', NULL, O_RDWR | O_BINARY, 0);
++ if (tmpfd == -1)
++ pfatal ("Can't create temporary file %s", quotearg (tmpname));
++ tmpfp = fdopen (tmpfd, "w+b");
++ if (! tmpfp)
++ pfatal ("Can't open stream for file %s", quotearg (tmpname));
++ }
++
+ for (;;) {
+ char ed_command_letter;
+ beginning_of_this_line = file_tell (pfp);
+@@ -2414,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname,
+ }
+ ed_command_letter = get_ed_command_letter (buf);
+ if (ed_command_letter) {
+- if (pipefp)
+- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
++ if (tmpfp)
++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
+ write_fatal ();
+ if (ed_command_letter != 'd' && ed_command_letter != 's') {
+ p_pass_comments_through = true;
+ while ((chars_read = get_line ()) != 0) {
+- if (pipefp)
+- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
++ if (tmpfp)
++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
+ write_fatal ();
+ if (chars_read == 2 && strEQ (buf, ".\n"))
+ break;
+@@ -2434,13 +2442,47 @@ do_ed_script (char const *inname, char const *outname,
+ break;
+ }
+ }
+-if (!pipefp)
++if (!tmpfp)
+ return;
+-if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0
+- || fflush (pipefp) != 0)
++if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0
++ || fflush (tmpfp) != 0)
+ write_fatal ();
+-if (pclose (pipefp) != 0)
+- fatal ("%s FAILED", editor_program);
++
++if (lseek (tmpfd, 0, SEEK_SET) == -1)
++
x11/dmenu: drop fonts/terminus-font from RUN_DEPENDS
Hello,
Today I realized I have fonts/terminus-font installed, thing I don't
remember I did. When I tried to pkg_delete it, it turns out it's a
dependency for x11/dmenu, which I do use. fonts/terminus-font gets
pulled in by x11/dmenu because of a customization patch for
look-and-feel.
As I like keeping my package list quite minimal, and I don't think
it's good idea to introduce a patch that requires ourselves to pull an
additional dependency, here's a diff for removing the config.def.h
patch and fonts/terminus-font from RUN_DEPENDS.
Let me know if I overlooked something or if there is a good reason to
keep fonts/terminus-font as a dep.
CC'd maintainer.
-Lucas
Index: Makefile
===
RCS file: /home/cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile12 Jul 2019 20:51:09 - 1.25
+++ Makefile31 May 2020 03:18:43 -
@@ -4,6 +4,7 @@ COMMENT=dynamic menu for X11
V= 4.9
DISTNAME= dmenu-${V}
+REVISION= 0
CATEGORIES=x11
@@ -18,8 +19,6 @@ PERMIT_PACKAGE= Yes
WANTLIB= X11 Xft Xinerama c fontconfig
MASTER_SITES= https://dl.suckless.org/tools/
-
-RUN_DEPENDS= fonts/terminus-font
MAKE_ENV= LDFLAGS="${LDFLAGS}" \
X11INC=${X11BASE}/include \
Index: patches/patch-config_def_h
===
RCS file: patches/patch-config_def_h
diff -N patches/patch-config_def_h
--- patches/patch-config_def_h 10 May 2017 22:06:33 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-$OpenBSD: patch-config_def_h,v 1.2 2017/05/10 22:06:33 jung Exp $
config.def.h.orig Mon May 8 19:27:54 2017
-+++ config.def.h Mon May 8 19:27:30 2017
-@@ -4,13 +4,13 @@
- static int topbar = 1; /* -b option; if 0, dmenu
appears at bottom */
- /* -fn option overrides fonts[0]; default X11 font or font set */
- static const char *fonts[] = {
-- "monospace:size=10"
-+ "terminus:size=8"
- };
- static const char *prompt = NULL; /* -p option; prompt to the left
of input field */
- static const char *colors[SchemeLast][2] = {
- /* fg bg */
-- [SchemeNorm] = { "#bb", "#22" },
-- [SchemeSel] = { "#ee", "#005577" },
-+ [SchemeNorm] = { "#c0c0c0", "#202020" },
-+ [SchemeSel] = { "#f0f0f0", "#404040" },
- [SchemeOut] = { "#00", "#00" },
- };
- /* -l option; if nonzero, dmenu uses vertical list with given number of lines
*/
RENAME: math/ebc => math/bc-gh
Hi ports --
As begun here [0], I think it makes sense to rename our ebc package to
bc-gh. The attached new port does exactly that (and updates to the
latest version of bc-gh at the same time).
Also attached is a quirks entry. Will of course remove math/ebc and
update math/Makefile as appropriate.
OK?
~Brian
[0] https://marc.info/?l=openbsd-ports=158672715211884=2
bc-gh.tgz
Description: application/compressed-tar
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.950
diff -u -p -r1.950 Makefile
--- Makefile 29 May 2020 22:51:12 - 1.950
+++ Makefile 30 May 2020 22:48:27 -
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.341
+PKGNAME = quirks-3.342
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.968
diff -u -p -r1.968 Quirks.pm
--- files/Quirks.pm 29 May 2020 22:51:12 - 1.968
+++ files/Quirks.pm 30 May 2020 22:48:27 -
@@ -424,6 +424,7 @@ my $stem_extensions = {
'py-dulwich' => 'py3-dulwich',
'py-cups' => 'py3-cups',
'py-fastimport' => 'py3-fastimport',
+ 'ebc' => 'bc-gh',
};
my $obsolete_reason = {
Update: games/wrath 0.0.0.20200530
Hi ports@, This updates wrath to the latest commit of the wrath-darkplaces engine which is necessary to play the new update of the commercial game Wrath: Aeon of Ruin. Tested with the new game content on amd64. Index: Makefile === RCS file: /cvs/ports/games/wrath/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile25 May 2020 16:08:41 - 1.1.1.1 +++ Makefile30 May 2020 23:50:43 - @@ -2,11 +2,11 @@ COMMENT = client of wrath-darkplaces engine -DISTNAME = wrath-0.0.0.20200228 +DISTNAME = wrath-0.0.0.20200530 GH_ACCOUNT = KillPixelGames GH_PROJECT = wrath-darkplaces -GH_COMMIT =ae8a4c06f2b2b088a537bb75c439817f4a009d6a +GH_COMMIT =7fa67fed66335554160a7c6d8b599c69b316e027 CATEGORIES = games Index: distinfo === RCS file: /cvs/ports/games/wrath/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo25 May 2020 16:08:41 - 1.1.1.1 +++ distinfo30 May 2020 23:50:43 - @@ -1,2 +1,2 @@ -SHA256 (wrath-0.0.0.20200228-ae8a4c06.tar.gz) = VO36gNeK+KbhNar+7mCEQVi2Eg+3lbrYua/m2eftZ3g= -SIZE (wrath-0.0.0.20200228-ae8a4c06.tar.gz) = 2686672 +SHA256 (wrath-0.0.0.20200530-7fa67fed.tar.gz) = tLCgezvbEIeJqWMM4GBg7rA1RzVIQMrZ58svs8pnP/Y= +SIZE (wrath-0.0.0.20200530-7fa67fed.tar.gz) = 2687099 Index: pkg/README === RCS file: /cvs/ports/games/wrath/pkg/README,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 README --- pkg/README 25 May 2020 16:08:41 - 1.1.1.1 +++ pkg/README 30 May 2020 23:50:43 - @@ -12,7 +12,7 @@ of the game. If you have the GOG version, you need to use innoextract to extract the data: -$ innoextract setup_wrath_aeon_of_ruin_ea_1.2.1_\(36418\).exe +$ innoextract setup_wrath_aeon_of_ruin_ea_1.3.1_\(64bit\)_\(38633\).exe To start wrath, you need to run it in a directory containing the kp1 directory of the game or you can start wrath using the -basedir=
arm bulk build report
bulk build on armv7.ports.openbsd.org started on Sun May 10 03:35:26 MDT 2020 finished at Sat May 30 18:05:43 MDT 2020 lasted 20D14h30m done with kern.version=OpenBSD 6.7 (GENERIC) #295: Sat May 9 15:18:12 MDT 2020 built packages:8668 May 10:552 May 11:477 May 12:138 May 13:283 May 14:328 May 15:129 May 16:52 May 17:104 May 18:148 May 19:503 May 20:210 May 21:205 May 22:424 May 23:358 May 24:435 May 25:47 May 26:414 May 27:476 May 28:545 May 29:358 May 30:2481 critical path missing pkgs: http://build-failures.rhaalovely.net/arm/2020-05-10/summary.log build failures: 40 http://build-failures.rhaalovely.net/arm/2020-05-10/audio/pithos.log http://build-failures.rhaalovely.net/arm/2020-05-10/audio/rgain.log http://build-failures.rhaalovely.net/arm/2020-05-10/audio/solfege.log http://build-failures.rhaalovely.net/arm/2020-05-10/chinese/libpinyin.log http://build-failures.rhaalovely.net/arm/2020-05-10/devel/dyncall.log http://build-failures.rhaalovely.net/arm/2020-05-10/devel/liboil.log http://build-failures.rhaalovely.net/arm/2020-05-10/devel/llvm,,-main.log http://build-failures.rhaalovely.net/arm/2020-05-10/devel/luapack,lua52.log http://build-failures.rhaalovely.net/arm/2020-05-10/devel/ptlib.log http://build-failures.rhaalovely.net/arm/2020-05-10/devel/sdl2.log http://build-failures.rhaalovely.net/arm/2020-05-10/devel/sqlc.log http://build-failures.rhaalovely.net/arm/2020-05-10/emulators/dgen-sdl,debugger.log http://build-failures.rhaalovely.net/arm/2020-05-10/games/solarus/roth.log http://build-failures.rhaalovely.net/arm/2020-05-10/games/stone-soup,no_x11.log http://build-failures.rhaalovely.net/arm/2020-05-10/geo/py-rio-cogeo,python3.log http://build-failures.rhaalovely.net/arm/2020-05-10/geo/py-supermercado,python3.log http://build-failures.rhaalovely.net/arm/2020-05-10/graphics/gprof2dot.log http://build-failures.rhaalovely.net/arm/2020-05-10/graphics/libmpeg2.log http://build-failures.rhaalovely.net/arm/2020-05-10/graphics/py-dot,python3.log http://build-failures.rhaalovely.net/arm/2020-05-10/graphics/xfig.log http://build-failures.rhaalovely.net/arm/2020-05-10/lang/STk.log http://build-failures.rhaalovely.net/arm/2020-05-10/lang/janet.log http://build-failures.rhaalovely.net/arm/2020-05-10/lang/parrot.log http://build-failures.rhaalovely.net/arm/2020-05-10/lang/pfe.log http://build-failures.rhaalovely.net/arm/2020-05-10/lang/racket-minimal,no_jit.log http://build-failures.rhaalovely.net/arm/2020-05-10/lang/swi-prolog.log http://build-failures.rhaalovely.net/arm/2020-05-10/mail/bogofilter,db4.log http://build-failures.rhaalovely.net/arm/2020-05-10/mail/courier-unicode.log http://build-failures.rhaalovely.net/arm/2020-05-10/math/dieharder.log http://build-failures.rhaalovely.net/arm/2020-05-10/math/mathomatic.log http://build-failures.rhaalovely.net/arm/2020-05-10/multimedia/gstreamer-0.10/plugins-ffmpeg.log http://build-failures.rhaalovely.net/arm/2020-05-10/net/gpodder.log http://build-failures.rhaalovely.net/arm/2020-05-10/net/utox.log http://build-failures.rhaalovely.net/arm/2020-05-10/print/pdfshuffler.log http://build-failures.rhaalovely.net/arm/2020-05-10/sysutils/nomad.log http://build-failures.rhaalovely.net/arm/2020-05-10/sysutils/rclone.log http://build-failures.rhaalovely.net/arm/2020-05-10/sysutils/terragrunt.log http://build-failures.rhaalovely.net/arm/2020-05-10/telephony/pjsua,-main.log http://build-failures.rhaalovely.net/arm/2020-05-10/x11/gnustep/libobjc2.log http://build-failures.rhaalovely.net/arm/2020-05-10/x11/industrial-icon-theme.log recurrent failures failures/audio/pithos.log failures/audio/rgain.log failures/audio/solfege.log failures/chinese/libpinyin.log failures/devel/llvm,,-main.log failures/devel/sdl2.log failures/devel/sqlc.log failures/emulators/dgen-sdl,debugger.log failures/games/solarus/roth.log failures/games/stone-soup,no_x11.log failures/graphics/gprof2dot.log failures/graphics/libmpeg2.log failures/graphics/py-dot,python3.log failures/graphics/xfig.log failures/lang/STk.log failures/lang/janet.log failures/mail/courier-unicode.log failures/math/dieharder.log failures/math/mathomatic.log failures/multimedia/gstreamer-0.10/plugins-ffmpeg.log failures/net/utox.log failures/print/pdfshuffler.log failures/sysutils/nomad.log failures/sysutils/rclone.log failures/sysutils/terragrunt.log failures/x11/gnustep/libobjc2.log failures/x11/industrial-icon-theme.log new failures +++ ls-failures Sat May 30 18:07:14 2020 +failures/devel/dyncall.log +failures/devel/liboil.log +failures/devel/luapack,lua52.log +failures/devel/ptlib.log +failures/geo/py-rio-cogeo,python3.log +failures/geo/py-supermercado,python3.log +failures/net/gpodder.log +failures/telephony/pjsua,-main.log resolved failures --- ../old/arm/last//ls-failuresWed May 6 23:14:19 2020 -failures/audio/picard.log -failures/audio/puddletag.log -failures/cad/yosys.log -failures/devel/arm-none-eabi/gcc-linaro,aarch64.log -failures/devel/py-certifi,python3.log
Re: lang/ghc: more cleanups
On Fri, May 29, 2020 at 5:22 PM Matthias Kilian wrote: > this is mainly for getting rid of overriding things via CONFIGURE_ENV > and CFLAGS in favor of patching aclocal.m4 and configure.ac (and > running autoconf), which may help getting this merged upstream. > > It also kills some left-over -fno-pie which came from > patches/patch-configure. > > I decided to drop the clang-specific > > -Wno-unused-command-line-argument -Wno-expansion-to-defined > > for now, because the warnings, although a little bit annoying, are > harmless, and because this should be fixed elsewhere -- it's not > specific to OpenBSD. > > Tested on amd64 *and* i386 this time, by building all the hs ports > and also by giving ghci a quick try. > > Does this make sense? LGTM Tested on amd64 by rebuilding xmonad with its dependencies (using cabal). Thanks Greg
NEW: devel/py-patiencediff
This package is a dependency of another new package. OK? Information for inst:py3-patiencediff-0.1.0 Comment: python implementation of the patiencediff algorithm Description: This package contains the implementation of the patiencediff algorithm, as first described by Bram Cohen. Like Python's difflib, this module provides both a convience unified_diff function for the generation of unified diffs of text files as well as a SequenceMatcher that can be used on arbitrary lists. Patiencediff provides a good balance of performance, nice output for humans, and implementation simplicity. The code in this package was extracted from the Bazaar code base. The package comes with two implementations: - A Python implementation (_patiencediff_py.py); this implementation only requires a Python interpreter and is the more readable version of the two - A C implementation implementation (_patiencediff_c.c); this implementation is faster, but requires a C compiler and is less readable Maintainer: The OpenBSD ports mailing-list WWW: https://pypi.org/project/patiencediff/ py-patiencediff.tar.gz Description: application/gzip
Re: games/ioquake3 cvs current diffs adding ppc support
> Sent: Saturday, May 30, 2020 at 9:45 PM
> From: "Charlene Wendling"
> To: "Landry Breuil"
> Cc: "Alex Free" , ports@openbsd.org, abie...@openbsd.org
> Subject: Re: games/ioquake3 cvs current diffs adding ppc support
>
> Hi,
>
> On Sat, 30 May 2020 09:36:25 +0200
> Landry Breuil wrote:
>
> > On Sat, May 30, 2020 at 09:09:13AM +0200, Alex Free wrote:
> > > Successfully built and tested against current.
> > >
> > > Let me know if I can do anything else to make this happen.
> > >
> > > A new file named patch-code_qcommon_q_platform_h contains the
> > > following immediately below.
> >
> > note that you can do a cvs add of that new file, and cvs diff will
> > show it.
> >
> > > Below are the CVS diffs.
> >
> > usually, when sending a diff for a port, you to the cvs diff from the
> > port directory, otherwise the person applying it will have to cd to
> > /usr or use patch -p2 in that case.
> >
> > those are not strong remarks, your diff itself is fine, it's just
> > 'best practice to get used to' if you plan to send more diffs (which
> > are always welcome!)
>
> ^ Agreed :)
>
> It builds fine on macppc indeed, there are font glitches, but i don't
> have much time to fiddle with q3config.cfg since i can't read options.
> It requires to disable HDR at least to have proper weapons/font
> textures with my Radeon 9700.
>
> Alex, if you had the issue and know what is needed to make glitches
> disappear, we should add it to pkg/README :)
>
> OK cwen@ either way, here is the diff as we usually expect it by the way.
>
> Charlène.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/ioquake3/Makefile,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 Makefile
> --- Makefile 12 Jul 2019 20:46:19 - 1.25
> +++ Makefile 30 May 2020 18:22:36 -
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.25 2019/07/12 20:46:19 sthen Exp $
>
> BROKEN-i386= need to free up a register
> -ONLY_FOR_ARCHS= amd64 i386
> +ONLY_FOR_ARCHS= amd64 i386 macppc
>
> COMMENT= clone of the original Quake III Arena
>
> @@ -33,7 +33,11 @@ ALL_TARGET="release"
> USE_GMAKE= Yes
> NO_TEST= Yes
>
> +.if ${MACHINE_ARCH} == "powerpc"
> +QUAKE_ARCH= ppc
> +.else
> QUAKE_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/}
> +.endif
> SUBST_VARS+= QUAKE_ARCH
>
> do-install:
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/games/ioquake3/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-Makefile
> --- patches/patch-Makefile16 Apr 2018 13:12:22 - 1.2
> +++ patches/patch-Makefile30 May 2020 18:22:36 -
> @@ -3,7 +3,16 @@ $OpenBSD: patch-Makefile,v 1.2 2018/04/1
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -743,16 +743,16 @@ ifeq ($(PLATFORM),openbsd)
> +@@ -4,7 +4,7 @@
> + # GNU Make required
> + #
> + COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]'
> '[:lower:]' | sed -e 's/\//_/g')
> +-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e
> 's/^arm.*/arm/')
> ++COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e
> 's/macppc/ppc/' | sed -e 's/^arm.*/arm/')
> +
> + ifeq ($(COMPILE_PLATFORM),sunos)
> + # Solaris uname and GNU uname differ
> +@@ -769,16 +769,16 @@ ifeq ($(PLATFORM),openbsd)
> -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
> CLIENT_CFLAGS += $(SDL_CFLAGS)
>
> @@ -23,7 +32,7 @@ Index: Makefile
> OPTIMIZE = $(OPTIMIZEVM) -ffast-math
> HAVE_VM_COMPILED=true
> else
> -@@ -1525,7 +1525,6 @@ Q3CPPOBJ = \
> +@@ -1562,7 +1562,6 @@ Q3CPPOBJ = \
> $(B)/tools/cpp/eval.o \
> $(B)/tools/cpp/include.o \
> $(B)/tools/cpp/hideset.o \
> Index: patches/patch-code_qcommon_q_platform_h
> ===
> RCS file: patches/patch-code_qcommon_q_platform_h
> diff -N patches/patch-code_qcommon_q_platform_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-code_qcommon_q_platform_h 30 May 2020 18:22:36 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: code/qcommon/q_platform.h
> +--- code/qcommon/q_platform.h.orig
> code/qcommon/q_platform.h
> +@@ -223,6 +223,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> +
> + #ifdef __i386__
> + #define ARCH_STRING "x86"
> ++#elif defined __ppc__
> ++#define ARCH_STRING "ppc"
> + #elif defined __amd64__
> + #undef idx64
> + #define idx64 1
>
Thank you all for informing me of how to submit things correctly. I
greatly appreciate the correct format for the patches submitted here.
As for the font issues, I only have one powerpc machine with graphics
acceleration support in OpenBSD 6.7. Mach64 DRI was dropped years ago.
My one machine has a Radeon 9200 32MB graphics card so I had to change
the renderer to opengl1 in q3cfg.cfg using the text below.
seta cl_renderer "opengl1"
Also, fullscreen is scaled
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/30 17:06:32 Modified files: www/gitea : Makefile distinfo Log message: Update gitea 1.11.5 -> 1.11.6 Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.11.6
Re: [ircd-hybrid] Bug in 6.7 (v8.2.28) TLS detection is broken
> Stefan Hagen wrote:
> > I saw that ircd-hybrid is updated in -current to Version 8.2.31.
> > This version works fine.
> >
> > However, in 6.7 release, we have version 8.2.28, which is affected by a
> > bug that was corrected in 8.2.30 with this commit:
> >
> > https://github.com/ircd-hybrid/ircd-hybrid/commit/8512c8ef40bde3b3ec1cf8e0d4090089c240e3a2
> > Should we correct it in 6.7?
As I'm using this port in production, I can as well take over the
maintenance. Thus I snug the MAINTAINER line into the diff.
This diff is for 6.7. to fix TLS in in the Version used in the stable
OpenBSD release.
Index: net/ircd-hybrid/Makefile
===
RCS file: /cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 Makefile
--- net/ircd-hybrid/Makefile2 Feb 2020 15:33:23 - 1.53
+++ net/ircd-hybrid/Makefile30 May 2020 21:21:24 -
@@ -4,8 +4,12 @@ COMMENT = Internet Relay Chat server
DISTNAME = ircd-hybrid-8.2.28
CATEGORIES = net
+REVISION = 0
+
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz
+
+MAINTAINER = Stefan Hagen
HOMEPAGE = http://ircd-hybrid.com/
Index: net/ircd-hybrid/patches/patch-config_h_in
===
RCS file: net/ircd-hybrid/patches/patch-config_h_in
diff -N net/ircd-hybrid/patches/patch-config_h_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/ircd-hybrid/patches/patch-config_h_in 30 May 2020 21:21:24 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fixed issue where HAVE_LIBCRYPTO wouldn't get defined even if the configure
test was successful
+
+Index: config.h.in
+--- config.h.in.orig
config.h.in
+@@ -76,6 +76,9 @@
+ /* Define to 1 if you have the header file. */
+ #undef HAVE_INTTYPES_H
+
++/* Define to 1 if you have the `crypto' library (-lcrypto). */
++#undef HAVE_LIBCRYPTO
++
+ /* Define if you have the libdl library or equivalent. */
+ #undef HAVE_LIBDL
+
Index: net/ircd-hybrid/patches/patch-configure
===
RCS file: net/ircd-hybrid/patches/patch-configure
diff -N net/ircd-hybrid/patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/ircd-hybrid/patches/patch-configure 30 May 2020 21:21:24 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Fixed issue where HAVE_LIBCRYPTO wouldn't get defined even if the configure
test was successful
+
+Index: configure
+--- configure.orig
configure
+@@ -16758,6 +16758,22 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free"
>&5
+ $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
+ if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBCRYPTO 1
++_ACEOF
++
++ LIBS="-lcrypto $LIBS"
++
++fi
++
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++fi
++
++if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl"
>&5
+ $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
+ if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
+@@ -16804,15 +16820,6 @@ _ACEOF
+ fi
+
+ fi
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-
+-
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL, or
OpenSSL 1.1.1 and above" >&5
+ $as_echo_n "checking for LibreSSL, or OpenSSL 1.1.1 and above... " >&6; }
Index: net/ircd-hybrid/patches/patch-m4_ax_arg_with_tls_m4
===
RCS file: net/ircd-hybrid/patches/patch-m4_ax_arg_with_tls_m4
diff -N net/ircd-hybrid/patches/patch-m4_ax_arg_with_tls_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/ircd-hybrid/patches/patch-m4_ax_arg_with_tls_m4 30 May 2020 21:21:24
-
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fixed issue where HAVE_LIBCRYPTO wouldn't get defined even if the configure
test was successful
+
+Index: m4/ax_arg_with_tls.m4
+--- m4/ax_arg_with_tls.m4.orig
m4/ax_arg_with_tls.m4
+@@ -9,7 +9,8 @@ if test "$with_tls" = "openssl" ||
+ AC_LANG_PROGRAM([
+ #include
+ #include ], [
+- exit(!(OPENSSL_VERSION_NUMBER >= 0x1010100fL)); ])],
[AC_CHECK_LIB(crypto, RSA_free,
[AC_CHECK_LIB(ssl, SSL_connect)], [], [])], [], [])])
++ exit(!(OPENSSL_VERSION_NUMBER >= 0x1010100fL)); ])],
[AC_CHECK_LIB(crypto, RSA_free, [], [],
[])], [], [])])
++AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"], [AC_CHECK_LIB(ssl,
SSL_connect)], [])
+
+ AC_MSG_CHECKING([for LibreSSL, or OpenSSL 1.1.1 and above])
+ AS_IF([test "$ac_cv_lib_ssl_SSL_connect" = "yes"],
NEW: security/mat2 0.11.0 - metadata anonymisation toolkit
Hi Team,
Here's a new package for mat2, a metadata removal tool supporting a wide
range of commonly used file formats.
https://0xacab.org/jvoisin/mat2
[+] Supported formats:
- application/epub+zip (.epub)
- application/pdf (.pdf)
- application/x-dtbncx+xml (.ncx)
- application/x-tar (.tar)
- application/zip (.zip)
- audio/mpeg (.mp3, .mp2)
- audio/x-wav (.wav)
- image/gif (.gif)
- image/jpeg (.jpeg, .jpe, .jpg)
- image/png (.png)
- image/svg+xml (.svg)
- image/tiff (.tif, .tiff)
- image/x-ms-bmp (.bmp)
- image/x-portable-pixmap (.ppm)
- text/css (.css)
- text/html (.html, .htm)
- text/plain (.txt)
- video/mp4 (.mp4)
- video/x-msvideo (.avi)
It build/install/run OK on amd64. I would appreciate feedback to confirm
the python FLAVORING is done properly. Thanks ajacoutot@ for pointing me
to the use of devel/py-gobject3${MODPY_FLAVOR} (and not just ${FLAVOR}).
I've opened an issue upstream (Ref; #142) to add tests/
If they do I will make sure to add this to the next update.
I've used it successfully on pictures and pdfs.
More tests, comments, feedback will be appreciated.
Thanks.
Regards,
--
clematis (0xA2C87EDB507B4C53)
mat2.tar.gz
Description: application/tar-gz
Re: Update: fonts/iosevka-fonts 2.3.3 -> 3.0.1
Hi Chris, Chris Rawnsley writes: > The package now includes more variants, namely Slab, Term Slab, Fixed > Slab, Aile, Etoile and Sparkle. If we keep adding fonts in this way we'll eventually end up with 60+ iosevka packages. I think we should package by family instead. This would reduce the number of packages to about one third of our current approach. E.g.: iosevka, iosevka-term, iosevka-fixed in one package; iosevka-slab, iosevka-term-slab, iosevka-fixed-slab in another; and so on. This way of consolidating them is at least somewhat encouraged by upstream, who provides distfiles for not just single fonts but also these groups of three. Personally I'd prefer a subdir over MULTI_PACKAGES also. -- Anthony J. Bentley
Update: fonts/iosevka-fonts 2.3.3 -> 3.0.1
Hi,
Here is a patch to update the font Iosevka to its latest version.
Compared to v2, the default variant is closer to v3's -term and -term is
closer to -fixed.
The package now includes more variants, namely Slab, Term Slab, Fixed
Slab, Aile, Etoile and Sparkle. I've tried to include enough detail in
their descriptions to distinguish them.
Index: Makefile
===
RCS file: /cvs/ports/fonts/iosevka-fonts/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile6 Mar 2020 19:32:35 - 1.1.1.1
+++ Makefile30 May 2020 20:20:34 -
@@ -2,22 +2,39 @@
COMMENT-main = slender typeface for code (default variant)
COMMENT-term = slender typeface for code (term variant)
+COMMENT-fixed =slender typeface for code (fixed variant)
+COMMENT-slab = slender typeface for code (slab variant)
+COMMENT-termslab = slender typeface for code (term slab variant)
+COMMENT-fixedslab =slender typeface for code (fixed slab variant)
+COMMENT-aile = quasi-proportional typeface for docs (aile variant)
+COMMENT-etoile = quasi-proportional typeface for docs (etoile variant)
+COMMENT-sparkle = quasi-proportional typeface for docs (sparkle variant)
+
+V =3.0.1
+DISTNAME = iosevka-${V}
+PKGNAME-main = ${DISTNAME}
+PKGNAME-term = iosevka-term-${V}
+PKGNAME-fixed =iosevka-fixed-${V}
+PKGNAME-slab = iosevka-slab-${V}
+PKGNAME-termslab = iosevka-termslab-${V}
+PKGNAME-fixedslab =iosevka-fixedslab-${V}
+PKGNAME-aile = iosevka-aile-${V}
+PKGNAME-etoile = iosevka-etoile-${V}
+PKGNAME-sparkle = iosevka-sparkle-${V}
+
+DISTFILES =ttf-iosevka-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-term-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-fixed-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-slab-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-term-slab-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-fixed-slab-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-aile-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-etoile-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-sparkle-${V}${EXTRACT_SUFX}
-V =2.3.3
-PKGNAME = iosevka-fonts-default-${V}
-PKGNAME-main = ${PKGNAME}
-PKGNAME-term = iosevka-fonts-term-${V}
-
-# The font has many different variants. We are only packaging the 'default'
-# variant (for general use) and the 'term' variant (designed for monospace
-# terminals), but more could be added later if need be. See the releases page
-# on Github for a complete list.
-DISTFILES =01-iosevka-${V}${EXTRACT_SUFX} \
- 02-iosevka-term-${V}${EXTRACT_SUFX}
+CATEGORIES = fonts
-CATEGORIES = fonts x11
-
-HOMEPAGE = https://github.com/be5invis/iosevka
+HOMEPAGE = https://typeof.net/Iosevka/
MAINTAINER = Edd Barrett
@@ -27,7 +44,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES =
https://github.com/be5invis/iosevka/releases/download/v${V}/
EXTRACT_SUFX = .zip
-MULTI_PACKAGES = -main -term
+MULTI_PACKAGES = -main -term -fixed -slab -termslab -fixedslab \
+ -aile -etoile -sparkle
NO_BUILD = Yes
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/fonts/iosevka-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo6 Mar 2020 19:32:35 - 1.1.1.1
+++ distinfo30 May 2020 20:20:34 -
@@ -1,4 +1,18 @@
-SHA256 (01-iosevka-2.3.3.zip) = zI3jyld7ih1JR9zN//ggUELkefAiOldN41kn4T9Qb5A=
-SHA256 (02-iosevka-term-2.3.3.zip) =
APzmF0BfzNf79zFtrdP2s8yx4nbykQ6anN4S4/BYtNc=
-SIZE (01-iosevka-2.3.3.zip) = 20624208
-SIZE (02-iosevka-term-2.3.3.zip) = 16093865
+SHA256 (ttf-iosevka-3.0.1.zip) = IkQjAvkPV6F0pru7DHlxvDei5KT2bHy30RRHqrcHL60=
+SHA256 (ttf-iosevka-aile-3.0.1.zip) =
C0EKMAXZcX5ApMbHjaRz4S2jGK5QTytko8xHjJY/xas=
+SHA256 (ttf-iosevka-etoile-3.0.1.zip) =
y5XWStmP9zEkg7O3bl+NxjcGKd2TyBGDVB6pzd4Bp5Q=
+SHA256 (ttf-iosevka-fixed-3.0.1.zip) =
NQuclWvRYJJXo2dr3EdKHUei7LyG+6nJ1RNY6KBGpQU=
+SHA256 (ttf-iosevka-fixed-slab-3.0.1.zip) =
EnUYBSB8UdazJnLz+b5l+NpIME8mp4au3aoRj9KbezI=
+SHA256 (ttf-iosevka-slab-3.0.1.zip) =
K0bTIKsaVQGWLHeDy5MW4LL9XWJVY81be0ZsVpQyP+w=
+SHA256 (ttf-iosevka-sparkle-3.0.1.zip) =
9C+Gf9KenuFoTotZHYHvp/tIcJjX4ZoggglfSrT+jEw=
+SHA256 (ttf-iosevka-term-3.0.1.zip) =
u6MwLYU09iOscg5lvGFT8uYbJHLOGvPau5r7RraaEkE=
+SHA256 (ttf-iosevka-term-slab-3.0.1.zip) =
CYJWlz8C//vOKwJc1TZF2nWerSVCsF9+B5iuYn9FHWQ=
+SIZE (ttf-iosevka-3.0.1.zip) = 51994994
+SIZE (ttf-iosevka-aile-3.0.1.zip) = 23811937
+SIZE (ttf-iosevka-etoile-3.0.1.zip) = 25109578
+SIZE
Re: Inconsolata 3.0 is no longer fixed width.
On Sat, May 30, 2020 at 01:00:17PM -0600, Anthony J. Bentley wrote: > Hi, > > Matthieu Herrb writes: > > This github issue does pretty much explain what's going on: > > https://github.com/googlefonts/Inconsolata/issues/42 : > > I see nothing as extreme as the screenshots in that link in my xterm. > But the new font is certainly wider than the previous one. > > So we should keep the old font, probably. > > Should we import the old one as inconsolata-old? > Or revert + set EPOCH, and import the new one as inconsolata-new? > The latter would avoid breaking people's setups. Later scheme would be less disturbing
Re: Inconsolata 3.0 is no longer fixed width.
Hi, Matthieu Herrb writes: > This github issue does pretty much explain what's going on: > https://github.com/googlefonts/Inconsolata/issues/42 : I see nothing as extreme as the screenshots in that link in my xterm. But the new font is certainly wider than the previous one. So we should keep the old font, probably. Should we import the old one as inconsolata-old? Or revert + set EPOCH, and import the new one as inconsolata-new? The latter would avoid breaking people's setups.
Re: [ircd-hybrid] Bug in 6.7 (v8.2.28) TLS detection is broken
*ping* Is this worth to be corrected in -release? If so - how does it work? Stefan Hagen wrote: > I saw that ircd-hybrid is updated in -current to Version 8.2.31. > This version works fine. > > However, in 6.7 release, we have version 8.2.28, which is affected by a > bug that was corrected in 8.2.30 with this commit: > > https://github.com/ircd-hybrid/ircd-hybrid/commit/8512c8ef40bde3b3ec1cf8e0d4090089c240e3a2 > > The bug leads to TLS not being activated and the TLS IRC ports won't > be available. It took me too long to figure this out as the SSL/TLS > configuration from the version in 6.6 to 6.7 also changed and I > suspected the error in the configuration changes I had to make. > > I think this is a big one as it breaks a primary function of the port. > > Should we correct it in 6.7? > > The easy way would be to update the port to 8.2.30. > Or shall we patch it into 8.2.28? > > For the latter, I've attached the required additional patches. > > Regards, > Stefan
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/30 11:33:36 Modified files: www: Makefile Log message: +hugo,extended
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/30 11:33:00 Modified files: www/hugo : Makefile www/hugo/pkg : DESCR Log message: new extended flavor for www/hugo Original diff by millert@ with input from rsadowski@ ok jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/30 11:20:43 Modified files: security/uacme : Makefile distinfo Removed files: security/uacme/patches: patch-nsupdate_sh patch-ualpn_c Log message: update to uacme 1.4
Re: python3 flavour for devel/subversion
I think this has all the pieces needed, ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.180
diff -u -p -r1.180 Makefile
--- Makefile28 May 2020 12:25:27 - 1.180
+++ Makefile30 May 2020 17:15:12 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.180 2020/05/28 12:25:27 stsp Exp $
+# $OpenBSD: Makefile,v 1.179 2020/05/15 14:47:40 ajacoutot Exp $
COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion
@@ -8,12 +8,13 @@ COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
VERSION= 1.14.0
+REVISION= 0
DISTNAME= subversion-${VERSION:S/rc/-rc/}
PKGNAME-main= subversion-${VERSION}
+FULLPKGNAME-main= subversion-${VERSION}${FLAVOR_EXT:S/-python3//}
+FULLPKGPATH-main= devel/subversion,-main${FLAVOR_EXT:S/-python3//:S/-/,/g}
FULLPKGNAME-perl= p5-SVN-${VERSION}
FULLPKGPATH-perl= devel/subversion,-perl
-FULLPKGNAME-python=py-subversion-${VERSION}
-FULLPKGPATH-python=devel/subversion,-python
FULLPKGNAME-ruby= ruby${MODRUBY_BINREV}-subversion-${VERSION}
FULLPKGPATH-ruby= devel/subversion,-ruby
FULLPKGNAME-ap2= ap2-subversion-${VERSION}
@@ -25,10 +26,6 @@ MODRUBY_REV ?= 2.7
# Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module
MODRUBY_BINREV=${MODRUBY_REV:S/.//}
-# Subversion supports either python2 or python3 bindings. Consumers in the
-# ports tree are not yet ready for python3. So keep using python 2.7 for now.
-MODPY_VERSION ?= 2.7
-
SO_VERSION=6.0
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_fs_x-1 \
@@ -57,12 +54,24 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=subv
EXTRACT_SUFX= .tar.bz2
PSEUDO_FLAVORS=no_bindings no_ap2 no_perl no_python no_ruby
no_gnome-keyring
-FLAVORS= maintainer_mode
+FLAVORS= maintainer_mode python3
FLAVOR?=
.if ${FLAVOR:Mno_bindings}
FLAVOR += no_perl no_python no_ruby
.endif
+.if ${FLAVOR:Mpython3}
+FULLPKGNAME-python=py3-subversion-${VERSION}
+FULLPKGPATH-python=devel/subversion,python3,-python
+# py-subversion and py3-subversion both install libsvn_swig_py-1;
+# conflict with the other flavour
+PY_CONFLICT= py-subversion-*
+.else
+FULLPKGNAME-python=py-subversion-${VERSION}
+FULLPKGPATH-python=devel/subversion,-python
+PY_CONFLICT= py3-subversion-*
+.endif
+
MODULES= lang/python
WANTLIB= expat iconv intl lz4 m pthread z
@@ -196,7 +205,8 @@ CONFIGURE_ARGS+=--without-gnome-keyring
TEST_DEPENDS=${MODPY_RUN_DEPENDS}
TEST_DEPENDS+= ${FULLPKGNAME-gnome-keyring}:${BUILD_PKGPATH},-gnome-keyring
-SUBST_VARS+= LOCALBASE SO_VERSION MODRUBY_BINREV LIBsvn_swig_ruby-1_VERSION
+SUBST_VARS+= LOCALBASE SO_VERSION MODRUBY_BINREV
+SUBST_VARS+= LIBsvn_swig_ruby-1_VERSION MODPY_WANTLIB PY_CONFLICT
pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.19
diff -u -p -r1.19 patch-Makefile_in
--- patches/patch-Makefile_in 28 May 2020 12:25:27 - 1.19
+++ patches/patch-Makefile_in 30 May 2020 17:15:12 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.19 2020/05/28 12:25:27 stsp Exp $
+$OpenBSD: patch-Makefile_in,v 1.18 2019/11/06 15:04:23 stsp Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -24,7 +24,7 @@ Index: Makefile.in
-SWIG_PY_LINK = @SWIG_PY_LINK@
-SWIG_PY_LIBS = @SWIG_PY_LIBS@
+SWIG_PY_LINK = @SWIG_PY_LINK@ -L@libdir@
-+SWIG_PY_LIBS = -lpython${MODPY_VERSION}
++SWIG_PY_LIBS = -l${MODPY_WANTLIB}
SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST-main
--- pkg/PLIST-main 15 May 2020 14:47:40 - 1.22
+++ pkg/PLIST-main 30 May 2020 17:15:12 -
@@ -122,8 +122,6 @@ lib/libsvn_subr-1.la
@static-lib lib/libsvn_wc-1.a
lib/libsvn_wc-1.la
@lib lib/libsvn_wc-1.so.${LIBsvn_wc-1_VERSION}
-@comment lib/python${MODPY_VERSION}/
-@comment lib/python${MODPY_VERSION}/site-packages/
@man man/man1/svn.1
@man man/man1/svnadmin.1
@man man/man1/svndumpfilter.1
Index: pkg/PLIST-python
===
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-python,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-python
--- pkg/PLIST-python15 May 2020 14:47:40 - 1.11
+++ pkg/PLIST-python30 May 2020 17:15:12 -
Re: CVS: cvs.openbsd.org: ports
On Sat, 30 May 2020, Paco Esteban wrote: > CVSROOT: /cvs > Module name: ports > Changes by: p...@cvs.openbsd.org2020/05/30 11:00:32 > > Modified files: > net/dnscontrol : Makefile distinfo > > Log message: > update net/dnscontrol to 3.1.1 > > Diff from Karlis Mikelsons. Thank you ! > > Tested by me against GANDI and R53 providers. > > ok jca@ and me Forgot to mention this was ok sthen@ too. -- Paco Esteban. 0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/30 11:06:38 Modified files: textproc/lowdown: Makefile distinfo textproc/lowdown/pkg: PLIST Log message: update textproc/lowdown to 0.6.5 Diff from Lucas Raab. Thank you ! Tested by me. ok jca and me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/30 11:00:32 Modified files: net/dnscontrol : Makefile distinfo Log message: update net/dnscontrol to 3.1.1 Diff from Karlis Mikelsons. Thank you ! Tested by me against GANDI and R53 providers. ok jca@ and me
Re: [-CURRENT] Microphone does not work in firefox anymore
Hi Alexandre On Tue, 26 May 2020 08:49:17 +0200 Alexandre Ratchov wrote: > On Mon, May 25, 2020 at 10:18:02PM +0200, Andrea Biscuola wrote: > > Hi Alexandre > > > > Just as an information, I tried to upgrade the system today > > with the latest snapshot and the latest packages. No luck, as > > the mic doesn't work with the teleconferencing tools > > > > I just did a "pkg_add -uI" again and I confirm, it's broken. The only > difference I see is the nss version. > I updated the packages today and now teleconferencing works again. Thanks! -- Andrea
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/05/30 09:50:38 Modified files: archivers/libarchive: Makefile distinfo Log message: update to 3.4.3
Re: Update lang/ecl to 20.4.24
On Tue, May 19, 2020 at 01:13:06PM -0400, Kurt Mosiejczuk wrote: > On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote: > > Here's a quick update to the new release, minimally tested as a > > lang/sbcl build host. The patch removes files, don't forget patch -E > > Someone should do testing with math/maxima, net/clic, and sysutils/reed-alert. > > --Kurt Maxima needs an upstream patch to build with ecl 20.4.24. This should be safe to commit now, before updating ecl. diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp b/math/maxima/patches/patch-lisp-utils_defsystem_lisp new file mode 100644 index 000..b3fd1683402 --- /dev/null +++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp @@ -0,0 +1,17 @@ +$OpenBSD$ + +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 +Fix for Bug #3629, to compile with ECL 20.4.24 + +Index: lisp-utils/defsystem.lisp +--- lisp-utils/defsystem.lisp.orig lisp-utils/defsystem.lisp +@@ -4152,7 +4152,7 @@ the system definition, if provided." + #+:ecl + (progn + (ext:package-lock "CL" nil) +-(setf (symbol-function 'lisp:require) ++(setf (symbol-function 'cl:require) + (symbol-function 'new-require)) + (ext:package-lock "CL" t)) + #+:lispworks diff --git a/math/maxima/patches/patch-src_maxima_system b/math/maxima/patches/patch-src_maxima_system new file mode 100644 index 000..5d651aa002e --- /dev/null +++ b/math/maxima/patches/patch-src_maxima_system @@ -0,0 +1,18 @@ +$OpenBSD$ + +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 +Fix for Bug #3629, to compile with ECL 20.4.24 + +Index: src/maxima.system +--- src/maxima.system.orig src/maxima.system +@@ -80,8 +80,7 @@ + (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" + (find-package "MAXIMA") + (if (and x (not (string= x ""))) (list x))) +-:epilogue-code '(progn (require :defsystem) +- (cl-user::run))) ++:epilogue-code '(progn (cl-user::run))) + + (defun maxima-binary-pathname () + #+clisp
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/05/30 07:34:23 Modified files: editors/libreoffice: Makefile distinfo editors/libreoffice/patches: patch-configure Log message: update to 6.4.4.2
Re: [update] net/onioncat 0.3.5
*ping*
‐‐‐ Original Message ‐‐‐
On Tuesday, April 28, 2020 5:07 PM, Stuart Henderson
wrote:
> Oh, gcat is a symlink. Shouldn't have @bin and it seems pretty
> useless since one can just use -I instead, so it's probably better to
> remove rather than @conflict with a common package.
>
> On 2020/04/28 16:29, Martin wrote:
>
> > 0.3.5a works stable for weeks. Anyway, I've asked the author about
> > versioning.
> > --- Makefile.old Fri Jul 12 23:48:35 2019
> > +++ Makefile Tue Apr 28 18:28:15 2020
> > @@ -1,13 +1,13 @@
> >
> > $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:35 sthen Exp $
> >
> > ==
> >
> > -COMMENT = IP-Transparent Tor Hidden Service Connector
> > +COMMENT = IP-Transparent Tor and I2P Hidden Service Connector
> > -V = 0.2.1
> > -DISTNAME = onioncat-$V
> > -REVISION = 1
> > +V = 0.3.5a
> > +DISTNAME = onioncat-${V}
> > +REVISION = 0
> > CATEGORIES = net
> > -HOMEPAGE = https://www.cypherpunk.at/onioncat_trac/
> > +HOMEPAGE = https://www.onioncat.org
> > MAINTAINER= Paul Irofti piro...@openbsd.org
> > @@ -16,13 +16,12 @@
> > WANTLIB = c pthread
> > -MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/
> > +MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/0.3/
> > RUN_DEPENDS = net/tor
> > SEPARATE_BUILD = Yes
> > -CONFIGURE_STYLE = simple
> > -CONFIGURE_ARGS += --mandir=${PREFIX}/man
> > +CONFIGURE_STYLE = gnu
> >
> > Do not pick up gawk or mawk
> >
> >
> >
> > CONFIGURE_ENV = AWK=awk
> > --- distinfo.old Sun Jan 18 06:14:44 2015
> > +++ distinfo Mon Apr 27 16:57:48 2020
> > @@ -1,2 +1,2 @@
> > -SHA256 (onioncat-0.2.1.tar.gz) =
> > Gge2K3LuZdEOcLly4q3hOH4iMrwGUnR+A76+cjXISo4=
> > -SIZE (onioncat-0.2.1.tar.gz) = 179988
> > +SHA256 (onioncat-0.3.5a.tar.gz) =
> > 9346847ab65f4e8e63f9bf34eb25a6049bb653e66efc017123e866eb64f48854
> > +SIZE (onioncat-0.3.5a.tar.gz) = 246122
> > --- pkg/PLIST.old Mon Oct 25 21:37:52 2010
> > +++ pkg/PLIST Tue Apr 28 18:33:22 2020
> > @@ -1,5 +1,8 @@
> > @comment $OpenBSD: PLIST,v 1.3 2010/10/25 17:37:52 pirofti Exp $
> > +@conflict coreutils-*
> > +@bin bin/gcat
> > @bin bin/ocat
> > @man man/man1/ocat.1
> > share/doc/onioncat/
> > +share/doc/onioncat/Garlicat-HOWTO
> > share/doc/onioncat/README
> > --- pkg/DESCR.old Tue Dec 30 16:56:39 2008
> > +++ pkg/DESCR Mon Apr 27 16:50:33 2020
> > @@ -1,4 +1,4 @@
> > -OnionCat creates a transparent IP layer on top of Tor's hidden services.
> > +OnionCat creates a transparent IP layer on top of Tor or I2P hidden
> > services.
> > It transmits any kind of IP-based data transparently through the Tor
> > network on a location hidden basis. You can think of it as a
> > point-to-multipoint VPN between hidden services.
> > Martin
> > ‐‐‐ Original Message ‐‐‐
> > On Tuesday, April 28, 2020 3:04 PM, Stuart Henderson s...@spacehopper.org
> > wrote:
> >
> > > On 2020/04/28 13:05, Martin wrote:
> > >
> > > > net/onioncat 0.2.1 -> 0.3.5
> > > > OK?
> > >
> > > Not ok.
> > > Should use CONFIGURE_STYLE=gnu and drop CONFIGURE_ARGS (fixes the path to
> > > config file), update the homepage (https://www.onioncat.org/), use https
> > > for MASTER_SITES, and either comment-out bin/gcat or register a conflict
> > > with coreutils.
> > > Also there is a stable/ directory upstream, combined with the 'a' suffix
> > > on version numbers in the current/ directory suggest maybe this is not
> > > the best branch for ports to use - unfortunately upstream changelogs
> > > stopped around 0.2.2 so it's difficult to figure out what's best.
> > > Also need to see what the maintainer says.
> > > (And send diffs, not tars, for updates..)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/30 06:52:57 Modified files: devel/vte3 : Makefile distinfo devel/vte3/pkg : PLIST Log message: update to vte3-0.60.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/30 06:52:14 Modified files: graphics/evince: Makefile distinfo Log message: update to evince-3.36.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/30 06:52:00 Modified files: www/epiphany : Makefile distinfo Log message: update to epiphany-3.36.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/30 06:52:07 Modified files: x11/gnome/system-monitor: Makefile distinfo x11/gnome/system-monitor/pkg: PLIST Log message: update to gnome-system-monitor-3.36.1
Re: Inconsolata 3.0 is no longer fixed width.
On Sat, May 30, 2020 at 12:41:16PM +0200, Matthieu Herrb wrote: > On Mon, May 25, 2020 at 01:08:52AM -0600, Anthony J. Bentley wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: bent...@cvs.openbsd.org 2020/05/25 01:08:52 > > > > Modified files: > > fonts/inconsolata-font: Makefile distinfo > > fonts/inconsolata-font/pkg: PLIST > > > > Log message: > > Update to inconsolata-font-3.000. > > > > Upstream has moved to a googlefonts GitHub repository. > > Hi, > > I cannot use this font in xterm or emacs anymore. > Looks like the new versions of the fonts are not really fixed. > > Which is confirmed by this message on the home page: > > Updated April 2020: Family has been upgraded to a variable font > family. > > This github issue does pretty much explain what's going on: > https://github.com/googlefonts/Inconsolata/issues/42 : > > Xft is not able to deal with so-called monospace fonts which include > wider glyphs, and there is no simple way to fix that. > > The emacs-gtk3 port could be told use the cairo bindings as it's > already a dependency for gtk3, but for xterm it's not an option. > > For now I'll install the old version of inconsolata for myself. We probably want to have the older font available as well... or build from source without the ligatures ?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/30 06:09:32 Modified files: security/fierce: Makefile distinfo security/fierce/pkg: PLIST Removed files: security/fierce/patches: patch-fierce_fierce_py Log message: update to fierce-1.4.0 from purpler...@secbsd.org, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/30 06:02:59 Modified files: sysutils/py-pushover: Makefile distinfo sysutils/py-pushover/pkg: PLIST Log message: use the correct upstream that provides a library too (pushover vs python-pushover).
Inconsolata 3.0 is no longer fixed width.
On Mon, May 25, 2020 at 01:08:52AM -0600, Anthony J. Bentley wrote: > CVSROOT: /cvs > Module name: ports > Changes by: bent...@cvs.openbsd.org 2020/05/25 01:08:52 > > Modified files: > fonts/inconsolata-font: Makefile distinfo > fonts/inconsolata-font/pkg: PLIST > > Log message: > Update to inconsolata-font-3.000. > > Upstream has moved to a googlefonts GitHub repository. Hi, I cannot use this font in xterm or emacs anymore. Looks like the new versions of the fonts are not really fixed. Which is confirmed by this message on the home page: Updated April 2020: Family has been upgraded to a variable font family. This github issue does pretty much explain what's going on: https://github.com/googlefonts/Inconsolata/issues/42 : Xft is not able to deal with so-called monospace fonts which include wider glyphs, and there is no simple way to fix that. The emacs-gtk3 port could be told use the cairo bindings as it's already a dependency for gtk3, but for xterm it's not an option. For now I'll install the old version of inconsolata for myself. -- Matthieu Herrb
[update] OfflineIMAP version 7.3.3
Hi,
here is an update for OfflineIMAP. It's only a small update.
https://github.com/OfflineIMAP/offlineimap/blob/v7.3.3/Changelog.md
I'm removing myself as maintainer since I switched to mbsync.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile26 Dec 2019 16:58:33 - 1.57
+++ Makefile30 May 2020 09:03:18 -
@@ -2,15 +2,13 @@
COMMENT= powerful IMAP/Maildir synchronization and reader support
-MODPY_EGG_VERSION = 7.3.2
+MODPY_EGG_VERSION = 7.3.3
DISTNAME = offlineimap-v${MODPY_EGG_VERSION}
PKGNAME = offlineimap-${MODPY_EGG_VERSION}
CATEGORIES=mail
HOMEPAGE= https://www.offlineimap.org/
-
-MAINTAINER=Remi Locherer
# GPLv2+
PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo26 Dec 2019 16:58:33 - 1.43
+++ distinfo30 May 2020 09:03:31 -
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-v7.3.2.tar.gz) =
ZyCh2l04+24PKzwnvOdPzgv3FLXHDS8PC6xlT0uilCM=
-SIZE (offlineimap-v7.3.2.tar.gz) = 740338
+SHA256 (offlineimap-v7.3.3.tar.gz) =
/BOu0FkBFzbrWbTF/tW06kph2guSz83VVe90VKjqy04=
+SIZE (offlineimap-v7.3.3.tar.gz) = 739666
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 04:09:27 Modified files: mail/cyrus-imapd: Makefile distinfo mail/cyrus-imapd/patches: patch-configure patch-imap_mailbox_c patch-imap_mbexamine_c patch-lib_imapoptions patch-man_imapd_conf_5 mail/cyrus-imapd/pkg: PLIST Log message: Update to cyrus-imapd-3.2.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 03:45:03 Modified files: x11/gnome/initial-setup: Makefile distinfo Log message: Update to gnome-initial-setup-3.36.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 03:34:30 Modified files: x11/gnome/librsvg: Makefile distinfo Log message: Update to librsvg-2.48.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 03:32:27 Modified files: x11/gnome/nautilus: Makefile distinfo Log message: Update to nautilus-3.36.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 03:05:58 Modified files: mail/evolution-ews: Makefile distinfo Log message: Update to evolution-ews-3.36.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 03:05:35 Modified files: mail/evolution : Makefile distinfo mail/evolution/pkg: PLIST Log message: Update to evolution-3.36.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 03:05:17 Modified files: databases/evolution-data-server: Makefile distinfo Log message: Update to evolution-data-server-3.36.3.
update zabbix to 5.0.1
Hi
The following diff takes us to zabbix 5.0 LTS, but this will require some more
widespread testing, so I am sharing the diff here first before I commit it.
Please run with it and share the results.
Thanks
Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.165
diff -u -p -u -r1.165 Makefile
--- Makefile15 Apr 2020 05:58:12 - 1.165
+++ Makefile30 May 2020 08:49:40 -
@@ -5,7 +5,7 @@ COMMENT-server =network and application
COMMENT-proxy =network and application monitoring - proxy
COMMENT-web = network and application monitoring - web frontend
-VERSION = 4.0.19
+VERSION = 5.0.1
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@@ -16,9 +16,6 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
-REVISION-proxy = 0
-REVISION-server = 0
-
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
HOMEPAGE = http://www.zabbix.com/
@@ -28,7 +25,7 @@ MAINTAINER = Robert Nagy https://cdn.zabbix.com/zabbix/sources/stable/${MAJV}/
MODULES= lang/php
MODPHP_BUILDDEP = No
@@ -40,7 +37,7 @@ FLAVORS = mysql pgsql sqlite3
SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
WANTLIB = c iconv kvm m execinfo lber ldap crypto ssl z \
- curl nghttp2 pcre
+ curl nghttp2 pcre pthread
LIB_DEPENDS = converters/libiconv \
databases/openldap \
@@ -53,12 +50,11 @@ RUN_DEPENDS-main =
LIB_DEPENDS-server = ${LIB_DEPENDS} \
textproc/libxml \
net/net-snmp \
- textproc/iksemel \
security/libssh2
RUN_DEPENDS-server = net/fping
# we want the _zabbix user as well as README-main
RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
-WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \
+WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp \
xml2 ssh2
CONFIGURE_STYLE = gnu
@@ -77,6 +73,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
ac_cv_search___res_query=no
+MAKE_ENV = GOCACHE=${WRKDIST}/go-cache
+
PREFIX-web = ${VARBASE}/www
LIB_DEPENDS-web =
RUN_DEPENDS-web = ${MODPHP_RUN_DEPENDS} \
@@ -88,7 +86,7 @@ LIB_DEPENDS-proxy = ${LIB_DEPENDS} \
net/net-snmp \
security/libssh2 \
textproc/libxml
-WANTLIB-proxy =${WANTLIB} netsnmp ssh2 xml2 pthread
+WANTLIB-proxy =${WANTLIB} netsnmp ssh2 xml2
RUN_DEPENDS-proxy =# empty
FLAVOR ?= no_server
@@ -105,14 +103,14 @@ MULTI_PACKAGES += -proxy -server
LIB_DEPENDS-proxy += databases/mariadb,-main
LIB_DEPENDS-server += databases/mariadb,-main
CONFIGURE_ARGS += --with-mysql
-WANTLIB-proxy += mysqlclient pthread
-WANTLIB-server += event mysqlclient
+WANTLIB-proxy += event mariadb pthread
+WANTLIB-server += event mariadb
.elif ${BACKEND} == "pgsql"
MULTI_PACKAGES += -proxy -server
LIB_DEPENDS-proxy += databases/postgresql,-main
LIB_DEPENDS-server += databases/postgresql,-main
CONFIGURE_ARGS += --with-postgresql
-WANTLIB-proxy += pq
+WANTLIB-proxy += event pq
WANTLIB-server += event pq
.elif ${BACKEND} == "sqlite3"
MULTI_PACKAGES += -proxy
@@ -121,7 +119,7 @@ CONFIGURE_ARGS += --with-sqlite3 \
# The proxy does not use jabber, so just disable the check
CONFIGURE_ARGS += --without-jabber
-WANTLIB-proxy += sqlite3
+WANTLIB-proxy += event sqlite3
LIB_DEPENDS-proxy += databases/sqlite3
.elif ${BACKEND} == "no_server"
CONFIGURE_ARGS += --disable-server \
@@ -138,7 +136,7 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/zabbix
- cd ${WRKBUILD}/frontends/php && tar -cf - . | \
+ cd ${WRKBUILD}/ui && tar -cf - . | \
tar -C ${DESTDIR}${PREFIX-web}/zabbix -xf -
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zabbix
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/conf/
Index: distinfo
===
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.50
diff -u -p -u -r1.50 distinfo
--- distinfo14 Apr 2020 14:47:24 - 1.50
+++ distinfo30 May 2020 08:49:40 -
@@ -1,2 +1,2 @@
-SHA256 (zabbix-4.0.19.tar.gz) = eU3rOFY7aqvZlSBlRN0ecIZ0N+X7xEhRcO23FoHaUTM=
-SIZE (zabbix-4.0.19.tar.gz) = 17211769
+SHA256 (zabbix-5.0.1.tar.gz) = IKGeXPI1T/y74kUhsEvs/Jh15XKJwA2nGZneYMSoU7Y=
+SIZE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/05/30 02:50:13 Modified files: mail/kopano/webapp: Makefile distinfo mail/kopano/webapp/pkg: PLIST Log message: update to 4.1.2765
python3 flavour for devel/subversion
Wih the diff below devel/subversion can be built with FLAVOR=python3.
My goal is to create a py3-subversion subpackage which contains the
Python3 bindings for Subversion, but I'm probably doing something wrong
or I am making wrong assumptions.
I end up with a flavoured -main package that's not actually needed:
/usr/ports/packages/amd64/all/subversion-1.14.0-python3.tgz
/usr/ports/packages/amd64/all/subversion-1.14.0.tgz
All the other subpackages which are built by this port overlap between
the python3 flavour and the default build: p5-SVN, ruby27-subversion,
gnome-keyring-subversion, and ap2-subversion
Using the python3 flavour only makes sense with MULTI_PACKAGES=-python.
Conceptually I need a subpackage-specific flavour and it looks like
this concept doesn't exist in the ports framework as such.
This command attempts to install subversion-1.14.0-python3 instead
of py3-subversion-1.14.0:
$ env FLAVOR=python3 MULTI_PACKAGES=-python SUDO=doas make install
===> Installing subversion-1.14.0-python3 from /usr/ports/packages/amd64/all/
Can't install subversion-1.14.0-python3 because of conflicts (.libs-subversion-1
.13.0p1,subversion-1.14.0,.libs-subversion-1.11.1)
--- subversion-1.14.0-python3 ---
Can't install subversion-1.14.0-python3: conflicts
Couldn't install subversion-1.14.0-python3
After 'pkg_delete subversion' I can install the python3 bindings with:
$ env FLAVOR=python3 SUDO=doas make install-all
And the python3 bindings themselves are working:
$ python3
Python 3.7.7 (default, May 28 2020, 14:54:22)
[Clang 8.0.1 (tags/RELEASE_801/final)] on openbsd6
Type "help", "copyright", "credits" or "license" for more information.
>>> import svn.fs
>>>
Ideally, only py-subversion and py3-subversion would conflict.
Is there a better way to do this? Can someone show me the way?
diff 354ab5270a9c1ea5e8e801a5aee04aca63f0be5e /usr/ports
blob - 8994a43fea1367f40b5eb8b0c9d3a91cb48c72f3
file + devel/subversion/Makefile
--- devel/subversion/Makefile
+++ devel/subversion/Makefile
@@ -12,7 +12,7 @@ DISTNAME= subversion-${VERSION:S/rc/-rc/}
PKGNAME-main= subversion-${VERSION}
FULLPKGNAME-perl= p5-SVN-${VERSION}
FULLPKGPATH-perl= devel/subversion,-perl
-FULLPKGNAME-python=py-subversion-${VERSION}
+FULLPKGNAME-python=${MODPY_PY_PREFIX}subversion-${VERSION}
FULLPKGPATH-python=devel/subversion,-python
FULLPKGNAME-ruby= ruby${MODRUBY_BINREV}-subversion-${VERSION}
FULLPKGPATH-ruby= devel/subversion,-ruby
@@ -25,10 +25,6 @@ MODRUBY_REV ?= 2.7
# Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module
MODRUBY_BINREV=${MODRUBY_REV:S/.//}
-# Subversion supports either python2 or python3 bindings. Consumers in the
-# ports tree are not yet ready for python3. So keep using python 2.7 for now.
-MODPY_VERSION ?= 2.7
-
SO_VERSION=6.0
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_fs_x-1 \
@@ -57,7 +53,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=subversion/}
EXTRACT_SUFX= .tar.bz2
PSEUDO_FLAVORS=no_bindings no_ap2 no_perl no_python no_ruby
no_gnome-keyring
-FLAVORS= maintainer_mode
+FLAVORS= maintainer_mode python3
FLAVOR?=
.if ${FLAVOR:Mno_bindings}
FLAVOR += no_perl no_python no_ruby
blob - 10f71448f892f604a77d21e8a59dc1e1d0840cc2
file + devel/subversion/pkg/PLIST-python
--- devel/subversion/pkg/PLIST-python
+++ devel/subversion/pkg/PLIST-python
@@ -1,11 +1,20 @@
@comment $OpenBSD: PLIST-python,v 1.11 2020/05/15 14:47:40 ajacoutot Exp $
@pkgpath devel/subversion,-python,gnome_keyring
-@static-lib lib/libsvn_swig_${MODPY_PY_PREFIX}1.a
-lib/libsvn_swig_${MODPY_PY_PREFIX}1.la
-@lib
lib/libsvn_swig_${MODPY_PY_PREFIX}1.so.${LIBsvn_swig_${MODPY_PY_PREFIX}1_VERSION}
+@static-lib lib/libsvn_swig_py-1.a
+lib/libsvn_swig_py-1.la
+@lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION}
lib/python${MODPY_VERSION}/site-packages/libsvn/
lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.py
-lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}diff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}ra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}repos.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/30 02:05:03 Modified files: devel/gobject-introspection: Makefile devel/vte3 : Makefile Log message: Remove hacks for ld.bfd(1) after recent gnome MODULE change.
Re: games/ioquake3 cvs current diffs adding ppc support
On Sat, May 30, 2020 at 09:09:13AM +0200, Alex Free wrote: > Successfully built and tested against current. > > Let me know if I can do anything else to make this happen. > > A new file named patch-code_qcommon_q_platform_h contains the following > immediately below. note that you can do a cvs add of that new file, and cvs diff will show it. > Below are the CVS diffs. usually, when sending a diff for a port, you to the cvs diff from the port directory, otherwise the person applying it will have to cd to /usr or use patch -p2 in that case. those are not strong remarks, your diff itself is fine, it's just 'best practice to get used to' if you plan to send more diffs (which are always welcome!) Landry
games/ioquake3 cvs current diffs adding ppc support
Successfully built and tested against current.
Let me know if I can do anything else to make this happen.
A new file named patch-code_qcommon_q_platform_h contains the following
immediately below.
$OpenBSD$
Index: code/qcommon/q_platform.h
--- code/qcommon/q_platform.h.orig
+++ code/qcommon/q_platform.h
@@ -223,6 +223,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
#ifdef __i386__
#define ARCH_STRING "x86"
+#elif defined __ppc__
+#define ARCH_STRING "ppc"
#elif defined __amd64__
#undef idx64
#define idx64 1
Below are the CVS diffs.
Index: ports/games/ioquake3/patches/patch-Makefile
===
RCS file: /cvs/ports/games/ioquake3/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-Makefile
--- ports/games/ioquake3/patches/patch-Makefile 16 Apr 2018 13:12:22 -
1.2
+++ ports/games/ioquake3/patches/patch-Makefile 30 May 2020 05:39:01 -
@@ -3,7 +3,16 @@ $OpenBSD: patch-Makefile,v 1.2 2018/04/1
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -743,16 +743,16 @@ ifeq ($(PLATFORM),openbsd)
+@@ -4,7 +4,7 @@
+ # GNU Make required
+ #
+ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]'
'[:lower:]' | sed -e 's/\//_/g')
+-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/')
++COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/macppc/ppc/'
| sed -e 's/^arm.*/arm/')
+
+ ifeq ($(COMPILE_PLATFORM),sunos)
+ # Solaris uname and GNU uname differ
+@@ -769,16 +769,16 @@ ifeq ($(PLATFORM),openbsd)
-pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -23,7 +32,7 @@ Index: Makefile
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
-@@ -1525,7 +1525,6 @@ Q3CPPOBJ = \
+@@ -1562,7 +1562,6 @@ Q3CPPOBJ = \
$(B)/tools/cpp/eval.o \
$(B)/tools/cpp/include.o \
$(B)/tools/cpp/hideset.o \
Index: ports/games/ioquake3/Makefile
===
RCS file: /cvs/ports/games/ioquake3/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- ports/games/ioquake3/Makefile 12 Jul 2019 20:46:19 - 1.25
+++ ports/games/ioquake3/Makefile 30 May 2020 05:35:47 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.25 2019/07/12 20:46:19 sthen Exp $
BROKEN-i386= need to free up a register
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= amd64 i386 macppc
COMMENT= clone of the original Quake III Arena
@@ -33,7 +33,11 @@ ALL_TARGET= "release"
USE_GMAKE= Yes
NO_TEST= Yes
+.if ${MACHINE_ARCH} == "powerpc"
+QUAKE_ARCH=ppc
+.else
QUAKE_ARCH=${ARCH:S/amd64/x86_64/:S/i386/x86/}
+.endif
SUBST_VARS+= QUAKE_ARCH
do-install:
Re: firefox: fix keepassxc browser addon
On Fri, May 29, 2020 at 03:30:12PM +0200, Klemens Nanni wrote: > > Firefox is simply missing an unveil to the program, with it added the > addon just works and I can fill input forms just perfectly. > > Also, shouldn't we add CVS revision markers to all files under > /etc/firefox/? Otherwise diffing them makes it hard for users to see > when particular entries where added without consulting the ports tree. sure, if the parser supports comments i dont see a downside.. > Note that I'd like to see this in the firefox file instead of a > keepassxc readme or so, otherwise package upgrades wouldn't pick up > future changes in those unveil.* files since keepassxc users have edited > them. well, i'm not a fan. Will we have to add unveils for every exception under the sun ? That will unveil that path for all users, including the ones who dont have keepassxc. What if a malicious pkg then installs a malicious script at this location ? yeah i know at that point you have other problems, but you get the point - unveil/pledge only what's *needed*.. - especially for things under usr/local. right now only /usr/local/lib/firefox and /usr/local/bin/gio-launch-desktop have rx. i'd rather have it in a README, be it firefox or keepassxc, you could have a 'Integration with keepassxc browser addon' seection like the '3rd-Party MIME Handlers' section, or a 'Integration with browsers' README in security/keepassxc. The pseudo-justification "package upgrades wouldn't pick up future changes in those unveil.* files since keepassxc users have edited them" is true for any @sample file that you edit (in any package), i dont see why there should be an exception for that case. pkg_add -u tells you some file were modified and have to be merged by hand or with sysmerge -p... Landry
