Re: NEW: audio/timgm6mb && make timidity and sdl{,2}-mixer use it
On 2019-05-15 10:13:46, Brian Callahan wrote:
> Hi ports --
>
> We currently have a less than ideal situation regarding where audio
> patchsets are located for programs that need them. Right now, they are
> bundled into the timidity package. Which does make sense, that way when you
> install timidity you get the needed audio patches. However, sdl{,2}-mixer
> both come with their own bundled copies of timidity but do not come with the
> patches, meaning that unless a user also just happens to have the timidity
> package installed, they don't have midi playback with sdl{,2}-mixer.
>
> This manifests in the ports tree with some games (corsixth, openxcom,
> prboom) having an RDEP on the timidity package solely in order for sdl-mixer
> to use the patches. There might be other packages that are missing out on
> midi audio support for the same reason.
>
> So I propose we split the patchset off from timidity. The attached new port
> (audio/timgm6mb) is the patchset plus the needed configuration files. The
> patches set timgm6mb as an RDEP of the ports that need it.
>
> After this goes in, I'll remove the RDEP on timidity from those 3 games.
>
Hello,
It's nice to see Timidity getting some love!
I've tested that playing a few random MIDI files works with
Timidity with your patches.
sdl{,2}-mixer also compiled and installed just fine too.
I installed games/prboom to test if music played with it, but
didn't hear any actual music play. Sound effects worked just
fine, but no music.
I rolled back to the original version of sdl-mixer and there was
no change, so I may simply be missing something in prboom's
configuration file or something.
Whatever the case may be, I saw no regressions in my (admittedly
light) testing.
On a related note, I don't mean to start a bikeshedding event, but
I'm curious about the history behind Timidity's FLAVORs. I
presume that the default (of not building a graphical version) was
done because Timidity was a dependency of so many other ports and
presume the intention was to keep it as small and light as
possible.
I use Timidity's XaW flavor because it's the only one that shows a
piano keyboard and what notes are playing, which is useful to me
sometimes.
Since XaW is a relatively lightweight toolkit (at least, compared
to the gtk2 FLAVOR) would there be any chance at making the XaW
flavor the default (and thereby removing it as a FLAVOR option)?
This would slightly simplify the port, and since the patchsets
would now have been moved into their own separate port, only
people who actually wanted to have timidity installed for itself
would be installing it, so there would be less of a reason to keep
the default as small and minimal as possible.
Of course, this is only a minor suggestion. If there's a good
reason for the FLAVORs being set up this way, then it doesn't take
much extra time on my part to manually compile and install Timidity
when necessary, so it's not a critical change.
Other options might include:
* Switch the port to use only X11 and non-X11 (I.e. build both
GTK2 and XaW together, without the option of selecting only one).
This would not be a problem for end users since Timidity allows
the user to select which toolkit to use at runtime.
-iddumb interface
-inncurses interface
-iaX Athena Widget interface
-igGTK+ interface
Indeed, I build it with FLAVOR="gtk2 xaw" and can select either
one at runtime.
* Just build everything all together regardless (I.e. remove ALL
FLAVORs from the Makefile).
This would pull in GTK2 and all of its dependencies, but I would
assume that most people working with MIDI files would likely have
GTK2 pulled in by some other graphical program somewhere anyway.
Timidity itself doesn't become very large. The
timidity-2.15.0p0-gtk2-xaw.tgz package weighs in at only 610K
Either way, thank you for putting in the effort to improve
Timidity (and related ports)!
--
Bryan
Re: Maintainer update: gitsh 0.14
ping
On 2019-04-15 17.38.01 +, Mike Burns wrote:
> gitsh 0.14[1] brings a lot more tab completion improvements.
>
> Part of this is that it installs an `/etc/completions` with
> user-overridable tab completions, useful for adding your own git
> subcommands. Thanks to afresh1@ for advice on how to do that[2]. Did I
> do it right?
>
> As usual, long PLIST diff because they bumped some vendored ruby
> libraries.
>
> [1]: https://github.com/thoughtbot/gitsh/releases/tag/v0.14
> [2]: https://bsd.network/@AFresh1/101837346684902378
>
> ---
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/gitsh/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 13 Jan 2019 14:00:56 - 1.10
> +++ Makefile 5 Apr 2019 21:37:35 -
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.10 2019/01/13 14:00:56 rsadowski Exp $
>
> -VERSION =0.13
> +VERSION =0.14
>
> COMMENT =interactive shell for git
>
> @@ -24,6 +24,7 @@ RUN_DEPENDS = devel/git
> LIB_DEPENDS =devel/readline
>
> CONFIGURE_STYLE =gnu
> +FAKE_FLAGS = pkgsysconfdir="${PREFIX}/share/examples/gitsh"
> CONFIGURE_ENV = READLINE_LIB="ereadline" \
> CPPFLAGS="-I${LOCALBASE}/include/ereadline" \
> LDFLAGS="-L${LOCALBASE}/lib" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/gitsh/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 13 Jan 2019 14:00:56 - 1.6
> +++ distinfo 5 Apr 2019 21:37:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (gitsh-0.13.tar.gz) = bDjbU4d/LESEAg8GgaRPEaKc5NHh2ssGK65JwvLDoqA=
> -SIZE (gitsh-0.13.tar.gz) = 1180908
> +SHA256 (gitsh-0.14.tar.gz) = S4m20AYyantXxMjkQFlOR322G30/4mM6iq0Xa7GdASU=
> +SIZE (gitsh-0.14.tar.gz) = 1171693
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/gitsh/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 13 Jan 2019 14:00:56 - 1.7
> +++ pkg/PLIST 5 Apr 2019 21:37:35 -
> @@ -2,6 +2,10 @@
> @bin bin/gitsh
> @man man/man1/gitsh.1
> @man man/man5/gitsh_completions.5
> +share/examples/gitsh/
> +@sample ${SYSCONFDIR}/gitsh/
> +share/examples/gitsh/completions
> +@sample ${SYSCONFDIR}/gitsh/completions
> share/gitsh/
> share/gitsh/ruby/
> share/gitsh/ruby/gitsh.rb
> @@ -52,6 +56,7 @@ share/gitsh/ruby/lib/gitsh/prompter.rb
> share/gitsh/ruby/lib/gitsh/quote_detector.rb
> share/gitsh/ruby/lib/gitsh/shell_command_runner.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/
> +share/gitsh/ruby/lib/gitsh/tab_completion/alias_expander.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/automaton.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/automaton_factory.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/command_completer.rb
> @@ -60,10 +65,12 @@ share/gitsh/ruby/lib/gitsh/tab_completio
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/choice_factory.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/concatenation_factory.rb
> +share/gitsh/ruby/lib/gitsh/tab_completion/dsl/fallback_transition_factory.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/lexer.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/maybe_operation_factory.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/null_factory.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/option_transition_factory.rb
> +share/gitsh/ruby/lib/gitsh/tab_completion/dsl/parse_error.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/parser.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/plus_operation_factory.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/dsl/rule_factory.rb
> @@ -76,551 +83,659 @@ share/gitsh/ruby/lib/gitsh/tab_completio
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/anything_matcher.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/base_matcher.rb
> +share/gitsh/ruby/lib/gitsh/tab_completion/matchers/branch_matcher.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/command_matcher.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/path_matcher.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/remote_matcher.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/revision_matcher.rb
> +share/gitsh/ruby/lib/gitsh/tab_completion/matchers/tag_matcher.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/text_matcher.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/matchers/unknown_option_matcher.rb
> +share/gitsh/ruby/lib/gitsh/tab_completion/tokens_to_words.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/variable_completer.rb
> share/gitsh/ruby/lib/gitsh/tab_completion/visualization.rb
> share/gitsh/ruby/lib/gitsh/terminal.rb
>
Re: New: games/warsow
On Fri, May 17, 2019 at 06:04:50AM +0300, Leonid Bobrov wrote:
> On Thu, May 16, 2019 at 06:41:06PM -0400, Brian Callahan wrote:
> > *Please* tell me you're going to send these patches upstream. There's a lot
> > here and as you say, you're trying to get this into more than just OpenBSD
> > ports, and your patches do far more than OpenBSD support.
> >
>
> Yes, I sent these patches to both upstreams.
>
> Meanwhile Warsow's new upstream is not collaborative because I used
> wallhack in the past and because more OS support "is a minor topic that
> has nothing with actual challenges in the game development":
> https://github.com/Warsow/qfusion/pull/40#issuecomment-492069962
> (at least I got some help from that person before he banned me at his
> organization)
>
> So, I think only qfusion's upstream will accept these patches:
> https://github.com/Qfusion/qfusion/pull/434
> (but I doubt compatibility between qfusion and its fork intended to
> continue Warsow's development)
>
> > I'm slowly going through everything and will write back when I'm finished.
> > There are definitely some things that need tweaking.
> >
>
> Yeah, I forgot to remove some CFLAGS from CMakeLists.txt when I was
> sending this port. Also please don't commit this port yes, I will
> fork this game's release and apply more patches if you notice something
> wrong or if for some reason I fail to build it at other *BSD, then I'll
> send this port again ready to be committed. And this fork will let me
> avoid headaches keeping patches in sync.
>
> > ~Brian
> >
>
Good, I am attaching a new tarball, it should give a perfect port
without patches directory, because it fetches my fork, so it's ready
to be committed to the ports tree.
Here's what I've done in general in this fork (it's intended only for
ports systems, all necessary patches are already sent to upstreams):
* No suffixes in libraries' and binaries' name which tell about for what
OS and processor architecture they were compiled.
* Removed C and C++ flags which should be given by ports systems.
* Support for pkgsrc and Ravenports in FindSDL2.cmake
* ar(1) won't receive linker flags.
* -std=gnu11 flag reduces amount of warnings.
* -Wpedantic flag should help cleaning code in the future.
* Use sendfile() at DragonFly BSD and FreeBSD, also implement one at all
other OSes.
* DATADIR macro defined by CMakeLists.txt to point to system-wide
directory with data files instead of current directory.
* Unquote library names in CMakeLists.txt files.
* BUILDSTRING, OSNAME, CPUSTRING, LIB_DIRECTORY, LIB_PREFIX and
LIB_SUFFIX macros are defined by CMakeLists.txt
* System-wide libraries will never be dlopen(3)'ed.
* AngelScript 2.29.2 is built and statically linked.
* Windows, MacOS and Linux libraries in modules_21.pk3 are ignored.
* Many matches for ${CMAKE_SYSTEM_NAME} were changed to WIN32, APPLE and
UNIX.
* is not only included at MacOS, but at every Unix-like
system.
* should only be included at Linux.
* -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500 flags were removed to
fix build break at FreeBSD.
* find_package(OpenGL) should add -I/usr/X11R6/include flag.
* All #if defined() were carefully changed to something like:
```
#if defined(_WIN32)
...
#elif defined(__APPLE__)
...
#elif defined(__ANDROID__)
...
#else
...
#endif
```
* SDL_SetWindowIcon() is commented because of buffer overflow in SDL2:
https://github.com/mazocomp/openbsd-wip/blob/3924bc18d05ded21bf0f69def7f1826ae92b2150/games/warsow/BACKTRACE
* SDL2 is a required dependency.
* readdir64 and dirent64 are defined at systems other than Linux.
* Remove unnecessary files which make source tarball waste 500 MB of
disk space.
TODO:
* Remove snd_openal module because it can only dlopen(3) audio/openal,
but since I removed support for dlopen(3)'ing system-wide libraries,
this module only needs audio/openal at build time and doesn't link to
it, so we are using snd_qf anyway.
* Fix critical compiler warnings like
if (unsigned int variable == ULONGMAX)
* Merge warsow_2.1 branch from https://github.com/Qfusion/qfusion/
* Rewrite AngelScript code so that we can link to system-wide
AngelScript library (I will contact qfusion upstream on this one).
* Carefully port libRocket so that we can link to system-wide libRocket.
* Add install target to CMakeLists.txt (I don't know how to do this yet)
* Get rid of all alloca() calls (I am really surprised the game doesn't
crash).
* Get rid of GNU extensions.
* Avoid using what was deprecated in C++17 standard.
warsow.tar.gz
Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/05/17 19:34:20 Modified files: devel/p5-Term-ProgressBar: Makefile distinfo devel/p5-Term-ProgressBar/pkg: PLIST Log message: p5-Term-ProgressBar: update to 2.22 Changelog: https://metacpan.org/source/MANWAR/Term-ProgressBar-2.22/Changes OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/05/17 19:26:36 Modified files: textproc/p5-XML-RSS: Makefile distinfo textproc/p5-XML-RSS/pkg: PLIST Log message: p5-XML-RSS: update to 1.60 Changelog: https://metacpan.org/source/SHLOMIF/XML-RSS-1.60/Changes tweaks and OK sthen@
Re: [update] textproc/p5-XML-RSS 1.59 -> 1.60
On Sat, 18 May 2019 01:09:00 +0100 Stuart Henderson wrote: > On 2019/05/17 23:13, Charlene Wendling wrote: > > Ping :) > > > > On Tue, 7 May 2019 00:04:05 +0200 > > Charlene Wendling wrote: > > > > > > > > Here is an update for XML::RSS. > > > > > > What's new upstream [0]: > > > > > > - Convert to Dist::Zilla > > > - Add Travis-CI support > > > (yup, only distribution changes) > > > > > > What's new in the port: > > > > > > - drop devel/p5-DateTime from RUN_DEPENDS, as DateTime isn't > > > used directly in the code > > > - make use of TEST_POD instead of pulling dependencies > > > - don't use 'rm -f' as a mean to zap something from PLIST but > > > @comment instead (rationale here [1]) > > > TIL that update-plist(1) won't add these .orig files anyway, > > > just issuing a warning > > I agree with bluhm about rm -f where it's needed, but I am happy > with rm (no -f) instead. > > But in this case with .orig files which update-plist doesn't include > anyway (which is relatively new for update-plist), I'd prefer to just > leave them out completely. But I don't really object to @comment. > OK either way. I'll remove them, in fact i didn't know if it was better to suppress warnings or not. Thanks for reviewing these ports :) Charlène. > > share/examples/p5-XML-RSS/1.0/rss1.0.rdf > > share/examples/p5-XML-RSS/1.0/slash.rdf > > share/examples/p5-XML-RSS/1.0/update_rss_1.0.pl > > +@comment share/examples/p5-XML-RSS/1.0/update_rss_1.0.pl.orig > > share/examples/p5-XML-RSS/2.0/ > > share/examples/p5-XML-RSS/2.0/flickr-rss-with-both-desc-and-media-desc.xml > > > > share/examples/p5-XML-RSS/2.0/rss-2.0-sample-from-rssboard-multiple-skip-days-and-hours.xml > > @@ -40,4 +48,5 @@ share/examples/p5-XML-RSS/convert.pl > > share/examples/p5-XML-RSS/create_rss_multiple.pl > > share/examples/p5-XML-RSS/rss2html.pl > > share/examples/p5-XML-RSS/rss_info.pl > > +@comment share/examples/p5-XML-RSS/rss_info.pl.orig > > share/examples/p5-XML-RSS/update_rss.pl > >
[fix] shells/perlsh runtime is broken
Hi ports,
While working on an update for devel/p5-Term-ReadLine-Gnu, i've found
out many issues with this port:
- HOMEPAGE and MASTER_SITES are pointing to a dead domain name
It's available on metacpan, so i've switched to MODULES=cpan,
that will deal with all distribution issues for us in 1 line.
- it uses features deprecated since Perl 5.22, like using defined()
against arrays [0], and arrays as references [1].
While [0] was a blocker for tests, [1] was spotted straight
after issuing 'psh'.
I've fixed these issues, the runtime is now as expected.
Comments/feedback are welcome!
Charlène.
[0]
https://perldoc.perl.org/5.22.0/perldelta.html#defined(%40array)-and-defined(%25hash)-are-now-fatal-errors
[1]
https://perldoc.perl.org/5.22.0/perldelta.html#Using-a-hash-or-an-array-as-a-reference-are-now-fatal-errors
Index: Makefile
===
RCS file: /cvs/ports/shells/perlsh/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile17 Jun 2017 01:31:46 - 1.11
+++ Makefile18 May 2019 00:37:59 -
@@ -4,15 +4,15 @@ COMMENT= Perl shell
DISTNAME= psh-1.8.1
PKGNAME= ${DISTNAME:S/p/perl/}
-REVISION= 1
+REVISION= 2
CATEGORIES=shells
-HOMEPAGE= http://www.focusresearch.com/gregor/sw/psh/
-
-# perl
+# Perl
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= http://www.focusresearch.com/gregor/download/
+MODULES= cpan
+
+CPAN_AUTHOR= GREGOR
RUN_DEPENDS= devel/p5-Term-ReadLine-Gnu \
devel/p5-Term-ReadLine-Perl \
Index: patches/patch-lib_Psh_Strategy_Executable_pm
===
RCS file: patches/patch-lib_Psh_Strategy_Executable_pm
diff -N patches/patch-lib_Psh_Strategy_Executable_pm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Psh_Strategy_Executable_pm18 May 2019 00:37:59
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Arrays can't be used as references since Perl 5.22.
+
+Index: lib/Psh/Strategy/Executable.pm
+--- lib/Psh/Strategy/Executable.pm.orig
lib/Psh/Strategy/Executable.pm
+@@ -24,7 +24,7 @@ sub runs_before {
+ }
+
+ sub applies {
+- my $com= @{$_[2]}->[0];
++ my $com= ${$_[2]}[0];
+ my $executable= Psh::Util::which($com);
+ return $executable if defined $executable;
+ return '';
Index: patches/patch-lib_Psh_pm
===
RCS file: patches/patch-lib_Psh_pm
diff -N patches/patch-lib_Psh_pm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Psh_pm18 May 2019 00:37:59 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+defined() used against arrays is fatal since Perl 5.22
+
+Index: lib/Psh.pm
+--- lib/Psh.pm.orig
lib/Psh.pm
+@@ -367,7 +367,7 @@ sub find_array_name {
+
+ sub defined_and_nonempty
+ {
+- if (!defined(@_)){ return 0; }
++ if (!@_){ return 0; }
+ if (scalar(@_) == 0) { return 0; }
+
+ if (scalar(@_) == 1) {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 18:33:52 Modified files: lang/python: python.port.mk Log message: check that FLAVORS is defined before using it in .if; problem with "make plist" following prior commit reported by juanfra@ with devel/mercurial.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2019/05/17 18:20:59 Modified files: sysutils/rancid: Makefile distinfo sysutils/rancid/pkg: PLIST Log message: Update rancid 3.8 -> 3.9 Changelog: https://www.shrubbery.net/rancid/CHANGES Update maintainer's e-mail address
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2019/05/17 18:18:19 Modified files: devel/py-twisted: Makefile graphics/xzgv : Makefile mail/mblaze: Makefile Log message: Remove maintainers per their requests
Re: [update] textproc/p5-XML-RSS 1.59 -> 1.60
On 2019/05/17 23:13, Charlene Wendling wrote: > Ping :) > > On Tue, 7 May 2019 00:04:05 +0200 > Charlene Wendling wrote: > > > > > Here is an update for XML::RSS. > > > > What's new upstream [0]: > > > > - Convert to Dist::Zilla > > - Add Travis-CI support > > (yup, only distribution changes) > > > > What's new in the port: > > > > - drop devel/p5-DateTime from RUN_DEPENDS, as DateTime isn't > > used directly in the code > > - make use of TEST_POD instead of pulling dependencies > > - don't use 'rm -f' as a mean to zap something from PLIST but > > @comment instead (rationale here [1]) > > TIL that update-plist(1) won't add these .orig files anyway, > > just issuing a warning I agree with bluhm about rm -f where it's needed, but I am happy with rm (no -f) instead. But in this case with .orig files which update-plist doesn't include anyway (which is relatively new for update-plist), I'd prefer to just leave them out completely. But I don't really object to @comment. OK either way. > share/examples/p5-XML-RSS/1.0/rss1.0.rdf > share/examples/p5-XML-RSS/1.0/slash.rdf > share/examples/p5-XML-RSS/1.0/update_rss_1.0.pl > +@comment share/examples/p5-XML-RSS/1.0/update_rss_1.0.pl.orig > share/examples/p5-XML-RSS/2.0/ > share/examples/p5-XML-RSS/2.0/flickr-rss-with-both-desc-and-media-desc.xml > > share/examples/p5-XML-RSS/2.0/rss-2.0-sample-from-rssboard-multiple-skip-days-and-hours.xml > @@ -40,4 +48,5 @@ share/examples/p5-XML-RSS/convert.pl > share/examples/p5-XML-RSS/create_rss_multiple.pl > share/examples/p5-XML-RSS/rss2html.pl > share/examples/p5-XML-RSS/rss_info.pl > +@comment share/examples/p5-XML-RSS/rss_info.pl.orig > share/examples/p5-XML-RSS/update_rss.pl >
Re: CVS: cvs.openbsd.org: ports
On 2019/05/17 22:28, Charlène Wendling wrote: > On Fri, 17 May 2019 14:23:24 -0600 (MDT) > Charlene Wendling wrote: > > > CVSROOT:/cvs > > Module name:ports > > Changes by: c...@cvs.openbsd.org2019/05/17 14:23:24 > > > > Modified files: > > devel/p5-Term-Encoding: Makefile distinfo > > > > Log message: > > p5-Term-Encoding: update to 0.03 > > Changelog: > > https://metacpan.org/release/MIYAGAWA/Term-Encoding-0.03 > > > > *sigh* This one wasn't OK'ed, i've taken the wrong list. Sorry. > OK sthen@ :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 16:52:26 Modified files: textproc/ispell: Makefile Log message: unbork ispell WANTLIB
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 16:51:05 Modified files: x11/fvwm2 : Makefile Log message: unbork fvwm2 WANTLIB; portbump -W/-w considered harmful
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2019/05/17 15:49:43 Modified files: www/gitea : Makefile distinfo www/gitea/patches: patch-custom_conf_app_ini_sample www/gitea/pkg : PLIST Log message: Update gitea 1.7.6 -> 1.8.1 Take maintainership, ok robert@
Re: [update] textproc/p5-XML-RSS 1.59 -> 1.60
Ping :)
On Tue, 7 May 2019 00:04:05 +0200
Charlene Wendling wrote:
>
> Here is an update for XML::RSS.
>
> What's new upstream [0]:
>
> - Convert to Dist::Zilla
> - Add Travis-CI support
> (yup, only distribution changes)
>
> What's new in the port:
>
> - drop devel/p5-DateTime from RUN_DEPENDS, as DateTime isn't
> used directly in the code
> - make use of TEST_POD instead of pulling dependencies
> - don't use 'rm -f' as a mean to zap something from PLIST but
> @comment instead (rationale here [1])
> TIL that update-plist(1) won't add these .orig files anyway,
> just issuing a warning
> - the private modules manpages are just templates, probably
> coming from the Dist::Zilla conversion, so i've commented
> them
>
> Testing:
>
> - 'make test' passes
> - There are 10 direct consumers, and i've found no new failures
> due to that update [2]
>
> Comments/feedback are welcome!
>
> Charlène.
>
>
> [0] https://metacpan.org/source/SHLOMIF/XML-RSS-1.60/Changes
> [1] https://marc.info/?l=openbsd-ports=155079323511455=2
> [2] http://0x0.st/zTB5.tgz
Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-XML-RSS/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- Makefile12 May 2017 20:11:58 - 1.41
+++ Makefile6 May 2019 21:39:57 -
@@ -2,7 +2,7 @@
COMMENT= perl module to manage XML RSS files
-DISTNAME = XML-RSS-1.59
+DISTNAME= XML-RSS-1.60
CATEGORIES=textproc
# perl
@@ -13,22 +13,20 @@ PKG_ARCH= *
CONFIGURE_STYLE= modbuild
-RUN_DEPENDS= devel/p5-DateTime \
- devel/p5-DateTime-Format-Mail \
- devel/p5-DateTime-Format-W3CDTF \
- devel/p5-Test-Manifest \
- textproc/p5-XML-Parser>=2.23 \
- www/p5-HTML-Parser
-BUILD_DEPENDS= ${RUN_DEPENDS}
-TEST_DEPENDS= devel/p5-Test-Differences \
- devel/p5-Test-Manifest>=0.9 \
- devel/p5-Test-Pod-Coverage \
- devel/p5-Test-TrailingSpace
+RUN_DEPENDS= devel/p5-DateTime-Format-Mail \
+ devel/p5-DateTime-Format-W3CDTF \
+ textproc/p5-XML-Parser \
+ www/p5-HTML-Parser
+
+TEST_DEPENDS= devel/p5-Test-Differences \
+ devel/p5-Test-Manifest>=0.9 \
+ devel/p5-Test-TrailingSpace
+
+MAKE_ENV+= TEST_POD=Yes
MODCPAN_EXAMPLES= Yes
post-install:
- find ${WRKSRC} -name \*.orig -print0 | xargs -0 rm -f
${MODCPAN_POST_INSTALL}
.include
Index: distinfo
===
RCS file: /cvs/ports/textproc/p5-XML-RSS/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo12 May 2017 20:11:58 - 1.19
+++ distinfo6 May 2019 21:39:57 -
@@ -1,2 +1,2 @@
-SHA256 (XML-RSS-1.59.tar.gz) = omtKEcEUmvxHlabwsYwex48/tjt3ngK2Ml5fYX9022w=
-SIZE (XML-RSS-1.59.tar.gz) = 129141
+SHA256 (XML-RSS-1.60.tar.gz) = SzNZh4uxorwG2uftF7ABQ6K4nIFLixL24ngPNbFShnc=
+SIZE (XML-RSS-1.60.tar.gz) = 130871
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/p5-XML-RSS/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST
--- pkg/PLIST 4 Feb 2009 12:53:39 - 1.11
+++ pkg/PLIST 6 May 2019 21:39:57 -
@@ -13,6 +13,13 @@ ${P5SITE}/XML/RSS/Private/Output/V0_91.p
${P5SITE}/XML/RSS/Private/Output/V1_0.pm
${P5SITE}/XML/RSS/Private/Output/V2_0.pm
@man man/man3p/XML::RSS.3p
+@comment man/man3p/XML::RSS::Private::Output::Base.3p
+@comment man/man3p/XML::RSS::Private::Output::Roles::ImageDims.3p
+@comment man/man3p/XML::RSS::Private::Output::Roles::ModulesElems.3p
+@comment man/man3p/XML::RSS::Private::Output::V0_9.3p
+@comment man/man3p/XML::RSS::Private::Output::V0_91.3p
+@comment man/man3p/XML::RSS::Private::Output::V1_0.3p
+@comment man/man3p/XML::RSS::Private::Output::V2_0.3p
share/examples/p5-XML-RSS/
share/examples/p5-XML-RSS/0.9/
share/examples/p5-XML-RSS/0.9/create_rss.pl
@@ -32,6 +39,7 @@ share/examples/p5-XML-RSS/1.0/create_rss
share/examples/p5-XML-RSS/1.0/rss1.0.rdf
share/examples/p5-XML-RSS/1.0/slash.rdf
share/examples/p5-XML-RSS/1.0/update_rss_1.0.pl
+@comment share/examples/p5-XML-RSS/1.0/update_rss_1.0.pl.orig
share/examples/p5-XML-RSS/2.0/
share/examples/p5-XML-RSS/2.0/flickr-rss-with-both-desc-and-media-desc.xml
share/examples/p5-XML-RSS/2.0/rss-2.0-sample-from-rssboard-multiple-skip-days-and-hours.xml
@@ -40,4 +48,5 @@ share/examples/p5-XML-RSS/convert.pl
share/examples/p5-XML-RSS/create_rss_multiple.pl
share/examples/p5-XML-RSS/rss2html.pl
share/examples/p5-XML-RSS/rss_info.pl
+@comment share/examples/p5-XML-RSS/rss_info.pl.orig
share/examples/p5-XML-RSS/update_rss.pl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/05/17 15:10:47 Modified files: textproc/p5-Text-WordDiff: Makefile distinfo textproc/p5-Text-WordDiff/pkg: DESCR Log message: p5-Text-WordDiff: update to 0.09 Changelog: https://metacpan.org/source/TIMK/Text-WordDiff-0.09/Changes OK afresh1@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/05/17 15:06:08 Modified files: textproc/p5-Text-Table: Makefile distinfo Log message: p5-Text-Table: update to 1.133 Changelog: https://metacpan.org/source/SHLOMIF/Text-Table-1.133/Changes OK afresh1@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/05/17 14:41:54 Modified files: databases/sqlports: Makefile databases/sqlports/files: Inserter.pm Sql.pm Var.pm mksqlitedb Log message: create indices for all fullpkgpaths in secondary tables, this ought to speed up some requests at least a little bit.
Re: CVS: cvs.openbsd.org: ports
On Fri, 17 May 2019 14:23:24 -0600 (MDT) Charlene Wendling wrote: > CVSROOT: /cvs > Module name: ports > Changes by: c...@cvs.openbsd.org2019/05/17 14:23:24 > > Modified files: > devel/p5-Term-Encoding: Makefile distinfo > > Log message: > p5-Term-Encoding: update to 0.03 > Changelog: > https://metacpan.org/release/MIYAGAWA/Term-Encoding-0.03 > *sigh* This one wasn't OK'ed, i've taken the wrong list. Sorry.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/05/17 14:23:24 Modified files: devel/p5-Term-Encoding: Makefile distinfo Log message: p5-Term-Encoding: update to 0.03 Changelog: https://metacpan.org/release/MIYAGAWA/Term-Encoding-0.03 OK afresh1@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/05/17 14:01:59 Modified files: devel/harfbuzz : Makefile Log message: Bring back lost WANTLIB from the png16 ->png change.
Re: UPDATE: Nextcloud-16.0.1
On Fri, May 17, 2019 at 06:11:08PM +0200, Bruno Flueckiger wrote:
> @@ -48,23 +48,27 @@ server "domain.tld" {
> key "/etc/ssl/private/domain.tld_private.pem"
> }
>
> + directory index index.php
> +
> # First deny access to the specified files
> - location "/.ht*"{ block }
> - location "/.user*" { block }
> - location "/3rdparty*" { block }
> - location "/README" { block }
> - location "/autotest*" { block }
> - location "/build*" { block }
> - location "/config*" { block }
> - location "/console*"{ block }
> - location "/data*" { block }
> - location "/db_*"{ block }
> - location "/indie*" { block }
> - location "/issue*" { block }
> - location "/lib*"{ block }
> - location "/occ*"{ block }
> - location "/templates*" { block }
> - location "/tests*" { block }
> + location "/nextcloud/.ht*" { block }
> + location "/nextcloud/.user*"{ block }
> + location "/nextcloud/3rdparty*" { block }
> + location "/nextcloud/AUTHORS" { block }
> + location "/nextcloud/COPYING" { block }
> + location "/nextcloud/config*" { block }
> + location "/nextcloud/console*" { block }
> + location "/nextcloud/data*" { block }
> + location "/nextcloud/lib*" { block }
> + location "/nextcloud/occ*" { block }
> +
> + location "/.well-known/caldav" {
> + block return 301 "https://$SERVER_NAME/nextcloud/remote.php/dav;
> +}
> +
> +location "/.well-known/carddav" {
> + block return 301 "https://$SERVER_NAME/nextcloud/remote.php/dav;
> +}
>
> location "/*.php*" {
> root "/nextcloud"
It is possible to run nextcloud with a block-by-default ruleset policy.
For example:
block drop
# Ensure that no '*.php*' files can be fetched from these directories
location "/nextcloud/config/*" {
block drop
}
location "/nextcloud/data/*" {
block drop
}
# Note that this matches "*.php*" anywhere in the request path.
location "/nextcloud/*.php*" {
root "/nextcloud"
request strip 1
fastcgi socket "/run/php-fpm.sock"
pass
}
location "/nextcloud/apps/*" {
root "/nextcloud"
request strip 1
pass
}
location "/nextcloud/core/*" {
root "/nextcloud"
request strip 1
pass
}
location "/nextcloud/settings/*" {
root "/nextcloud"
request strip 1
pass
}
location "/nextcloud" {
block return 301 "$DOCUMENT_URI/index.php"
}
location "/nextcloud/" {
block return 301 "$DOCUMENT_URI/index.php"
}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/05/17 13:14:08 Modified files: games/pingus : Makefile Added files: games/pingus/patches: patch-src_pingus_screens_demo_session_cpp Log message: pingus: fix the build with ports-gcc by adding a missing header While here, move HOMEPAGE to https. OK bentley@
Re: [new] purple-rocketchat
On Mon, May 06, 2019 at 05:34:58PM +0200, Landry Breuil wrote: > Hi, > > here's a port for a libpurple plugin adding support for rocket.chat from > https://bitbucket.org/EionRobb/purple-rocketchat - seems to work fine > here with pidgin using a token against $university account w/ sso. > > the ultimate goal being indeed to make this work with minbif or bitlbee > so that you can reach rocket.chat contacts from irssi.. Anyone willing to ok this one ? been using it since some days without issues. Dunno if the port/pkg name should be amended, so far we're not very consistent in the naming, we have: net/pidgin-icb net/pidgin-sipe net/telegram-purple net/microblog-purple x11/pidgin-libnotify i just kept the upstream naming for purple-rocketchat.. at least they're almost all under net/. Landry purple-rocketchat.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/05/17 11:42:15 Modified files: math/cblas : Makefile Log message: Always build shared libs with -fPIC, never -fpic. Fixes aarch64.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/05/17 11:26:29 Modified files: x11/gnome/todo : Makefile Log message: Sync WANTLIB. prodded by sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/05/17 11:24:20 Modified files: multimedia/dav1d: Makefile distinfo Removed files: multimedia/dav1d/patches: patch-src_itx_tmpl_c patch-src_lib_c patch-src_thread_h patch-src_win32_thread_c Log message: Update to dav1d-0.3.1. from Brad (maintainer)
Re: [New][CAD] Solvespace, a 2D/3D parametric CAD designer
Hi everyone, Just giving a ping :) have a great and Sunny weekend ! Jerome From: Neon King Sent: mercredi 8 mai 2019 18:03 To: Brian Callahan; ports@openbsd.org; Stuart Henderson Cc: ports@openbsd.org Subject: Re: [New][CAD] Solvespace, a 2D/3D parametric CAD designer hi ports@ my port tree wasn't up to date ... i had put again png16 instead of png in WANTLIBS but bcallah@ was right here is a version updated that could be probably be imported BR, Jerome
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/05/17 11:01:08 Modified files: math/arpack: Makefile math/arpack/pkg: PLIST Log message: * Always build shared libs with -fPIC, never -fpic. Fixes build on aarch64. * Do not build the profiling library. * No test target available.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/05/17 10:56:21 Modified files: www/webkitgtk4 : Makefile distinfo www/webkitgtk4/patches: patch-Source_cmake_WebKitCompilerFlags_cmake patch-Source_cmake_WebKitFeatures_cmake www/webkitgtk4/pkg: PLIST Removed files: www/webkitgtk4/patches: patch-Source_cmake_FindSSE2_cmake Log message: SECURITY update to webkitgtk4-2.24.2. - CVE-2019-8595, CVE-2019-8607, CVE-2019-8615
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/05/17 10:53:23 Modified files: www/webkitgtk4 : Tag: OPENBSD_6_5 Makefile distinfo www/webkitgtk4/patches: Tag: OPENBSD_6_5 patch-Source_cmake_WebKitCompilerFlags_cmake patch-Source_cmake_WebKitFeatures_cmake www/webkitgtk4/pkg: Tag: OPENBSD_6_5 PLIST Removed files: www/webkitgtk4/patches: Tag: OPENBSD_6_5 patch-Source_cmake_FindSSE2_cmake Log message: SECURITY update to webkitgtk4-2.24.2. - CVE-2019-8595, CVE-2019-8607, CVE-2019-8615
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 10:53:07 Modified files: security/hydra : Makefile Log message: missing libgcrypt dep; "NOT REACHABLE"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 10:50:48 Modified files: www/honk : Makefile Log message: totally missing LIB_DEPENDS/WANTLIB
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 10:45:30 Modified files: audio/audacity : Makefile audio/parlatype: Makefile audio/rhythmbox: Makefile devel/codeblocks: Makefile devel/ddd : Makefile devel/geany: Makefile devel/harfbuzz : Makefile devel/jdk/11 : Makefile devel/pango: Makefile devel/rapidsvn : Makefile devel/sdl2-image: Makefile editors/emacs : Makefile editors/libreoffice: Makefile emulators/hatari: Makefile emulators/mgba : Makefile emulators/snes9x: Makefile emulators/vbam : Makefile games/hyperrogue: Makefile games/manaplus : Makefile games/megaglest/base: Makefile games/openclonk: Makefile games/scorched3d: Makefile games/scummvm-tools: Makefile games/spacehulk: Makefile games/supertux : Makefile geo/gpx-viewer : Makefile geo/mapserver : Makefile geo/spatialite/gis: Makefile geo/spatialite/gui: Makefile geo/spatialite/librewms: Makefile graphics/GraphicsMagick: Makefile graphics/clutter/clutter-gst: Makefile graphics/clutter/cogl: Makefile graphics/darktable: Makefile graphics/digikam-kde4: Makefile graphics/gdk-pixbuf2: Makefile graphics/hugin : Makefile graphics/inkscape: Makefile graphics/ipe : Makefile graphics/krita : Makefile graphics/libgphoto2: Makefile graphics/netpbm: Makefile graphics/opencv: Makefile graphics/opencv2: Makefile graphics/p5-Imager: Makefile graphics/piglit: Makefile graphics/tesseract/tesseract: Makefile mail/claws-mail: Makefile math/R : Makefile misc/m17n/lib : Makefile multimedia/gstreamer1/plugins-good: Makefile multimedia/synfig: Makefile net/amule : Makefile net/filezilla : Makefile print/poppler : Makefile print/texlive/base: Makefile sysutils/bacula: Makefile www/chromium : Makefile www/iridium: Makefile www/webkitgtk4 : Makefile x11/gnome/aisleriot: Makefile x11/gnome/gcr : Makefile x11/gnome/libgnomekbd: Makefile x11/gnustep/gui: Makefile x11/gtk3mm : Makefile x11/gtksourceview4: Makefile x11/jgmenu : Makefile x11/kde-applications/gwenview: Makefile x11/mate/atril : Makefile x11/mate/caja : Makefile x11/mate/caja-extensions: Makefile x11/mate/control-center: Makefile x11/mate/desktop: Makefile x11/mate/engrampa: Makefile x11/mate/libmatekbd: Makefile x11/mate/libmateweather: Makefile x11/mate/marco : Makefile x11/mate/notification-daemon: Makefile x11/mate/panel : Makefile x11/mate/pluma : Makefile x11/mate/polkit: Makefile x11/mate/power-manager: Makefile x11/mate/screensaver: Makefile x11/mate/session-manager: Makefile x11/mate/settings-daemon: Makefile x11/mate/system-monitor: Makefile x11/mate/terminal: Makefile x11/virt-viewer: Makefile x11/wxWidgets : Makefile x11/xfce4/thunar: Makefile x11/xfce4/xfce4-pulseaudio: Makefile x11/xfce4/xfce4-taskmanager: Makefile x11/xfce4/xfce4-weather: Makefile x11/xfce4/xfce4-xkb: Makefile x11/xfce4/xfdashboard: Makefile Log message: set png16 WANTLIB entries back to png following the change in soname part done by portbump, part by hand (it is easily confused)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 10:19:41 Modified files: audio/jack : Makefile audio/pms : Makefile audio/xmcd : Makefile cad/gnucap : Makefile chinese/cless : Makefile comms/c3270: Makefile comms/pilot-link: Makefile comms/qodem: Makefile databases/postgresql-previous: Makefile databases/repmgr: Makefile devel/ald : Makefile devel/avrdude : Makefile devel/libslang : Makefile devel/libxsvf : Makefile devel/mspdebug : Makefile devel/p5-Curses: Makefile devel/p5-Term-ReadLine-Gnu: Makefile devel/remake : Makefile devel/stfl : Makefile editors/jed: Makefile editors/jove : Makefile editors/le : Makefile editors/nvi: Makefile editors/uemacs : Makefile editors/zile : Makefile education/gtypist: Makefile emulators/bochs: Makefile games/clines : Makefile games/cpat : Makefile games/dungeon : Makefile games/eliot: Makefile games/moria: Makefile games/nethack/3.4: Makefile games/netris : Makefile games/omega: Makefile games/slash-em : Makefile games/slash: Makefile games/stone-soup: Makefile games/xlife: Makefile graphics/libcaca: Makefile graphics/s10sh : Makefile korean/hanterm-xf: Makefile lang/datalog : Makefile lang/ghc : Makefile lang/scm : Makefile lang/swi-prolog: Makefile mail/elm : Makefile mail/lumail: Makefile mail/metamail : Makefile mail/nmzmail : Makefile math/aamath: Makefile math/foma : Makefile math/pspp : Makefile math/sc: Makefile math/wcalc : Makefile misc/dvtm : Makefile misc/lifelines : Makefile misc/most : Makefile multimedia/gstreamer-0.10/plugins-good: Makefile multimedia/vitunes: Makefile net/cftp : Makefile net/gopher : Makefile net/irrtoolset : Makefile net/mcabber: Makefile net/mosh : Makefile net/ntp: Makefile net/pidgin : Makefile net/pktstat: Makefile net/rtorrent : Makefile net/tinyfugue : Makefile net/trafshow : Makefile net/ysmv7 : Makefile news/nn: Makefile plan9/rc : Makefile productivity/siag: Makefile productivity/tdl: Makefile productivity/tudu: Makefile security/gnupg : Makefile security/nfsshell: Makefile shells/nsh : Makefile sysutils/shmux : Makefile sysutils/testdisk: Makefile textproc/aspell/core: Makefile textproc/hgrep : Makefile textproc/ispell: Makefile textproc/wdiff : Makefile www/canto : Makefile x11/fvwm2 : Makefile Log message: update curses WANTLIB entries following the change in base libraries to use soname
Re: UPDATE: Nextcloud-16.0.1
On 16.05., Gonzalo L. Rodriguez wrote:
> Hallo,
>
> Update for Nextcloud to 16.0.1:
>
> https://nextcloud.com/changelog/
>
> While here I added imagick.
>
> OK? Comments?
>
> Cheers.-
>
> --
>
> - gonzalo
Hi Gonzalo,
I've tested the fresh installation. Opening the new Nextcloud in the
browser for the first time gives me an error message from Nextcloud. At
the top of the window I see the string:
$CONFIG = array ( 'integrity.check.disabled' => true,);
Looks like Nextcloud cannot handle the config file during the first
call. As soon as I refresh the page in the browser I get the first time
installation dialog as expected. I haven't figured out how to get rid of
this.
After a fresh installation the list of security and setup warnings in
Nextcloud is pretty long. Some of the warnings can be silenced by
changes to /etc/httpd.conf. I've attached a diff for the README file.
Nextcloud complains that all the subdirectories in
/var/www/nextcloud/apps/ are not owned by the user www. I've attached a
diff for pkg/PLIST which prevents this.
Cheers,
Bruno
Index: pkg/README
===
RCS file: /cvs/ports/www/nextcloud/pkg/README,v
retrieving revision 1.12
diff -u -p -r1.12 README
--- pkg/README 11 Mar 2019 15:43:46 - 1.12
+++ pkg/README 16 May 2019 17:44:27 -
@@ -28,7 +28,7 @@ The HTTP server must be able to resolve
The configuration of an SQLite database path is set relatively to the chroot in
Nextcloud which will break background jobs run by cron(8) (see below).
A symlink can be created to workaround this issue:
-# ln -f ${INSTDIR} /nextcloud
+# ln -sf ${INSTDIR} /nextcloud
OpenBSD HTTP daemon
---
@@ -48,23 +48,27 @@ server "domain.tld" {
key "/etc/ssl/private/domain.tld_private.pem"
}
+ directory index index.php
+
# First deny access to the specified files
- location "/.ht*"{ block }
- location "/.user*" { block }
- location "/3rdparty*" { block }
- location "/README" { block }
- location "/autotest*" { block }
- location "/build*" { block }
- location "/config*" { block }
- location "/console*"{ block }
- location "/data*" { block }
- location "/db_*"{ block }
- location "/indie*" { block }
- location "/issue*" { block }
- location "/lib*"{ block }
- location "/occ*"{ block }
- location "/templates*" { block }
- location "/tests*" { block }
+ location "/nextcloud/.ht*" { block }
+ location "/nextcloud/.user*"{ block }
+ location "/nextcloud/3rdparty*" { block }
+ location "/nextcloud/AUTHORS" { block }
+ location "/nextcloud/COPYING" { block }
+ location "/nextcloud/config*" { block }
+ location "/nextcloud/console*" { block }
+ location "/nextcloud/data*" { block }
+ location "/nextcloud/lib*" { block }
+ location "/nextcloud/occ*" { block }
+
+ location "/.well-known/caldav" {
+ block return 301 "https://$SERVER_NAME/nextcloud/remote.php/dav;
+}
+
+location "/.well-known/carddav" {
+ block return 301 "https://$SERVER_NAME/nextcloud/remote.php/dav;
+}
location "/*.php*" {
root "/nextcloud"
--- pkg/PLIST.gonzalo Fri May 17 18:01:30 2019
+++ pkg/PLIST Fri May 17 18:01:46 2019
@@ -4980,9 +4980,6 @@
@owner www
@group www
nextcloud/apps/
-@mode
-@owner
-@group
nextcloud/apps/accessibility/
nextcloud/apps/accessibility/.babelrc.js
nextcloud/apps/accessibility/appinfo/
nginx tcp reverse proxy with ssl
Hi,
I'm using nginx as a TCP reverse proxy with ssl. I need this diff
otherwise it says:
# nginx -t
nginx: [emerg] the "ssl" parameter requires ngx_stream_ssl_module in
/etc/nginx/nginx.conf:17
nginx: configuration file /etc/nginx/nginx.conf test failed
I checked there wasn't any wanted wantlib change with make
lib-depends-check and the plist didn't change either. I bumped the
stream-revision because it affects the stream module but the configure
args is port wide so maybe I should bump everything?
Comments? OK?
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.132
diff -u -p -r1.132 Makefile
--- Makefile29 Apr 2019 00:42:09 - 1.132
+++ Makefile17 May 2019 15:53:36 -
@@ -33,6 +33,7 @@ PKGNAME-perl= nginx-perl-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
REVISION-passenger=0
+REVISION-stream= 0
MASTER_SITES= https://nginx.org/download/
MASTER_SITES0= https://github.com/simpl/ngx_devel_kit/archive/
@@ -163,6 +164,7 @@ CONFIGURE_ARGS+=--prefix=${NGINX_DIR} \
--with-http_xslt_module=dynamic \
--with-mail=dynamic \
--with-stream=dynamic \
+ --with-stream_ssl_module \
--add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
--add-dynamic-module=${WRKSRC}/ngx_devel_kit \
--add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 09:39:59 Modified files: net/putty : Makefile net/putty/pkg : PLIST-gui PLIST-main Log message: net/putty packaging change: move pageant to gui, it's linked against X11 libs. add a comment in case this can be moved back in a future update.
Re: UPDATE: www/gitea
Sure
On 17/05/19 16:17 +0300, Pavel Korovin wrote:
> Dear all,
>
> Please find the update for gitea-1.8.1 attached.
> Relase notes: https://github.com/go-gitea/gitea/releases/tag/v1.8.1
>
> Port changes:
> * Take maintainership as agreed with Robert, current maintainer
> * Update patches to keep in-sync with current release
> * Remove misleading comment in app.ini (it refers to non-existing
> custom/conf/app.ini config file)
>
> OK to commit?
>
> --
> With best regards,
> Pavel Korovin
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/gitea/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 4 May 2019 21:46:17 - 1.20
> +++ Makefile 17 May 2019 13:06:24 -
> @@ -2,7 +2,7 @@
>
> COMMENT =compact self-hosted Git service
>
> -VERSION =1.7.6
> +VERSION =1.8.1
> GH_ACCOUNT = go-gitea
> GH_PROJECT = gitea
> GH_TAGNAME = v${VERSION}
> @@ -11,7 +11,7 @@ CATEGORIES =www devel
>
> HOMEPAGE = https://gitea.io/
>
> -MAINTAINER = Robert Nagy
> +MAINTAINER = Pavel Korovin
>
> # MIT
> PERMIT_PACKAGE_CDROM = Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/gitea/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 17 Apr 2019 13:19:49 - 1.13
> +++ distinfo 17 May 2019 13:06:24 -
> @@ -1,2 +1,2 @@
> -SHA256 (gitea-1.7.6.tar.gz) = TMB+rSqEIySlu3a3gFXPG5OHagOEXDs4/6XLwOG6xvQ=
> -SIZE (gitea-1.7.6.tar.gz) = 20868421
> +SHA256 (gitea-1.8.1.tar.gz) = kfEJTxqoM8jiyxHPTC4TAcUzF6Scn2gYxKeh75JoUM0=
> +SIZE (gitea-1.8.1.tar.gz) = 24304805
> Index: patches/patch-custom_conf_app_ini_sample
> ===
> RCS file: /cvs/ports/www/gitea/patches/patch-custom_conf_app_ini_sample,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-custom_conf_app_ini_sample
> --- patches/patch-custom_conf_app_ini_sample 14 Feb 2019 10:08:53 -
> 1.4
> +++ patches/patch-custom_conf_app_ini_sample 17 May 2019 13:06:24 -
> @@ -3,7 +3,14 @@ $OpenBSD: patch-custom_conf_app_ini_samp
> Index: custom/conf/app.ini.sample
> --- custom/conf/app.ini.sample.orig
> +++ custom/conf/app.ini.sample
> -@@ -7,19 +7,19 @@
> +@@ -1,25 +1,21 @@
> +-; This file lists the default values used by Gitea
> +-; Copy required sections to your own app.ini (default is
> custom/conf/app.ini)
> +-; and modify as needed.
> ++; Documentation: https://docs.gitea.io/en-us/config-cheat-sheet/
> +
> +-; see https://docs.gitea.io/en-us/config-cheat-sheet/ for additional
> documentation.
> +-
> ; App name that shows in every page title
> APP_NAME = Gitea: Git with a cup of tea
> ; Change it if you run locally
> @@ -28,7 +35,7 @@ Index: custom/conf/app.ini.sample
> ; Global limit of repositories per user, applied at creation time. -1 means
> no limit
> MAX_CREATION_LIMIT = -1
> ; Mirror sync queue length, increase if mirror syncing starts hanging
> -@@ -52,7 +52,7 @@ LOCAL_WIKI_PATH = tmp/local-wiki
> +@@ -57,7 +53,7 @@ LOCAL_WIKI_PATH = tmp/local-wiki
> ; Whether repository file uploads are enabled. Defaults to `true`
> ENABLED = true
> ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on
> gitea restart)
> @@ -37,7 +44,7 @@ Index: custom/conf/app.ini.sample
> ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any
> file type
> ALLOWED_TYPES =
> ; Max size of each file in megabytes. Defaults to 3MB
> -@@ -82,7 +82,7 @@ THEME_COLOR_META_TAG = `#6cc644`
> +@@ -91,7 +87,7 @@ THEME_COLOR_META_TAG = `#6cc644`
> ; Max size of files to be displayed (default is 8MiB)
> MAX_DISPLAY_FILE_SIZE = 8388608
> ; Whether the email of the user should be shown in the Explore Users page
> @@ -45,8 +52,8 @@ Index: custom/conf/app.ini.sample
> +SHOW_USER_EMAIL = false
> ; Set the default theme for the Gitea install
> DEFAULT_THEME = gitea
> -
> -@@ -147,7 +147,7 @@ SSH_DOMAIN = %(DOMAIN)s
> + ; All available themes. Allow users select personalized themes regardless
> of the value of `DEFAULT_THEME`.
> +@@ -158,7 +154,7 @@ SSH_DOMAIN = %(DOMAIN)s
> ; The network interface the builtin SSH server should listen on
> SSH_LISTEN_HOST =
> ; Port number to be exposed in clone URL
> @@ -55,7 +62,7 @@ Index: custom/conf/app.ini.sample
> ; The port number the builtin SSH server should listen on
> SSH_LISTEN_PORT = %(SSH_PORT)s
> ; Root path of SSH directory, default is '~/.ssh', but you have to use
> '/home/git/.ssh'.
> -@@ -176,7 +176,7 @@ SSH_EXPOSE_ANONYMOUS = false
> +@@ -187,7 +183,7 @@ SSH_EXPOSE_ANONYMOUS = false
> ; Indicate whether to check minimum key size with corresponding type
> MINIMUM_KEY_SIZE_CHECK = false
> ; Disable CDN even in "prod" mode
> @@ -64,7 +71,7 @@ Index:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 07:42:00 Modified files: audio/beets: Makefile distinfo audio/beets/pkg: PLIST Log message: update to beets-1.4.8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 07:31:29 Modified files: devel/libmagic : Makefile distinfo Log message: update to libmagic (file) 5.37
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 07:35:49 Modified files: audio/py-acoustid: Makefile distinfo audio/py-acoustid/pkg: PLIST Log message: update to py-acoustid 1.1.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/05/17 07:27:03 Modified files: lang/python: python.port.mk Log message: It's well-known that update-plist has a hard time on py2/py3 ports when run outside the py3 flavor, so gently remind the porters. okay sthen@
UPDATE: www/gitea
Dear all,
Please find the update for gitea-1.8.1 attached.
Relase notes: https://github.com/go-gitea/gitea/releases/tag/v1.8.1
Port changes:
* Take maintainership as agreed with Robert, current maintainer
* Update patches to keep in-sync with current release
* Remove misleading comment in app.ini (it refers to non-existing
custom/conf/app.ini config file)
OK to commit?
--
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile4 May 2019 21:46:17 - 1.20
+++ Makefile17 May 2019 13:06:24 -
@@ -2,7 +2,7 @@
COMMENT = compact self-hosted Git service
-VERSION = 1.7.6
+VERSION = 1.8.1
GH_ACCOUNT = go-gitea
GH_PROJECT = gitea
GH_TAGNAME = v${VERSION}
@@ -11,7 +11,7 @@ CATEGORIES = www devel
HOMEPAGE = https://gitea.io/
-MAINTAINER = Robert Nagy
+MAINTAINER = Pavel Korovin
# MIT
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/www/gitea/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo17 Apr 2019 13:19:49 - 1.13
+++ distinfo17 May 2019 13:06:24 -
@@ -1,2 +1,2 @@
-SHA256 (gitea-1.7.6.tar.gz) = TMB+rSqEIySlu3a3gFXPG5OHagOEXDs4/6XLwOG6xvQ=
-SIZE (gitea-1.7.6.tar.gz) = 20868421
+SHA256 (gitea-1.8.1.tar.gz) = kfEJTxqoM8jiyxHPTC4TAcUzF6Scn2gYxKeh75JoUM0=
+SIZE (gitea-1.8.1.tar.gz) = 24304805
Index: patches/patch-custom_conf_app_ini_sample
===
RCS file: /cvs/ports/www/gitea/patches/patch-custom_conf_app_ini_sample,v
retrieving revision 1.4
diff -u -p -r1.4 patch-custom_conf_app_ini_sample
--- patches/patch-custom_conf_app_ini_sample14 Feb 2019 10:08:53 -
1.4
+++ patches/patch-custom_conf_app_ini_sample17 May 2019 13:06:24 -
@@ -3,7 +3,14 @@ $OpenBSD: patch-custom_conf_app_ini_samp
Index: custom/conf/app.ini.sample
--- custom/conf/app.ini.sample.orig
+++ custom/conf/app.ini.sample
-@@ -7,19 +7,19 @@
+@@ -1,25 +1,21 @@
+-; This file lists the default values used by Gitea
+-; Copy required sections to your own app.ini (default is custom/conf/app.ini)
+-; and modify as needed.
++; Documentation: https://docs.gitea.io/en-us/config-cheat-sheet/
+
+-; see https://docs.gitea.io/en-us/config-cheat-sheet/ for additional
documentation.
+-
; App name that shows in every page title
APP_NAME = Gitea: Git with a cup of tea
; Change it if you run locally
@@ -28,7 +35,7 @@ Index: custom/conf/app.ini.sample
; Global limit of repositories per user, applied at creation time. -1 means
no limit
MAX_CREATION_LIMIT = -1
; Mirror sync queue length, increase if mirror syncing starts hanging
-@@ -52,7 +52,7 @@ LOCAL_WIKI_PATH = tmp/local-wiki
+@@ -57,7 +53,7 @@ LOCAL_WIKI_PATH = tmp/local-wiki
; Whether repository file uploads are enabled. Defaults to `true`
ENABLED = true
; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea
restart)
@@ -37,7 +44,7 @@ Index: custom/conf/app.ini.sample
; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any
file type
ALLOWED_TYPES =
; Max size of each file in megabytes. Defaults to 3MB
-@@ -82,7 +82,7 @@ THEME_COLOR_META_TAG = `#6cc644`
+@@ -91,7 +87,7 @@ THEME_COLOR_META_TAG = `#6cc644`
; Max size of files to be displayed (default is 8MiB)
MAX_DISPLAY_FILE_SIZE = 8388608
; Whether the email of the user should be shown in the Explore Users page
@@ -45,8 +52,8 @@ Index: custom/conf/app.ini.sample
+SHOW_USER_EMAIL = false
; Set the default theme for the Gitea install
DEFAULT_THEME = gitea
-
-@@ -147,7 +147,7 @@ SSH_DOMAIN = %(DOMAIN)s
+ ; All available themes. Allow users select personalized themes regardless of
the value of `DEFAULT_THEME`.
+@@ -158,7 +154,7 @@ SSH_DOMAIN = %(DOMAIN)s
; The network interface the builtin SSH server should listen on
SSH_LISTEN_HOST =
; Port number to be exposed in clone URL
@@ -55,7 +62,7 @@ Index: custom/conf/app.ini.sample
; The port number the builtin SSH server should listen on
SSH_LISTEN_PORT = %(SSH_PORT)s
; Root path of SSH directory, default is '~/.ssh', but you have to use
'/home/git/.ssh'.
-@@ -176,7 +176,7 @@ SSH_EXPOSE_ANONYMOUS = false
+@@ -187,7 +183,7 @@ SSH_EXPOSE_ANONYMOUS = false
; Indicate whether to check minimum key size with corresponding type
MINIMUM_KEY_SIZE_CHECK = false
; Disable CDN even in "prod" mode
@@ -64,7 +71,7 @@ Index: custom/conf/app.ini.sample
DISABLE_ROUTER_LOG = false
; Generate steps:
; $ ./gitea cert -ca=true -duration=8760h0m0s -host=myhost.example.com
-@@ -185,13 +185,13 @@ DISABLE_ROUTER_LOG = false
+@@ -196,13 +192,13 @@ DISABLE_ROUTER_LOG = false
; not forget to export the private key):
; $
Re: [PATCH] portgen(1) man page: Add py type
On Fri, May 17, 2019 at 01:45:00PM +0100, Stuart Henderson wrote:
> On 2019/05/16 12:01, Andrew Hewus Fresh wrote:
> > I'm also not sure if there's a way to tell python.port.mk to use the
> > pthon3 FLAVOR (if it exists) when doing update-plist automatically, but
> > that would be more helpful than the special case in portgen.
>
> it *definitely* should not do that.
What you could do is warn.
Something like
.if make(plist) || make(update-plist)
. if ${FLAVORS:Mpython3} && !${FLAVOR:Mpython3}
ERRORS += "Warning: update-plist without FLAVOR=python3"
. endif
.endif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/05/17 06:52:46 Modified files: net/isc-bind : Makefile distinfo net/isc-bind/patches: patch-lib_isc_unix_socket_c Removed files: net/isc-bind/patches: patch-bin_named_client_c patch-bin_named_include_named_interfacemgr_h patch-bin_named_interfacemgr_c Log message: update to BIND 9.11.7
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Mon May 13 14:01:04 MDT 2019 finished at Fri May 17 06:35:09 MDT 2019 lasted 04D09h34m done with kern.version=OpenBSD 6.5-current (GENERIC.MP) #11: Sun May 12 03:02:36 MDT 2019 built packages:9809 May 13:336 May 14:3486 May 15:1262 May 16:1908 May 17:2816 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2019-05-13/summary.log build failures: 39 http://build-failures.rhaalovely.net/aarch64/2019-05-13/audio/chromaprint.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/comms/gnuradio.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/comms/lcdproc.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/databases/sqlports.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/devel/kdevelop.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/devel/libcoap.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/editors/xwpe.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/games/frozen-bubble,-main.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/games/vacuum.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/geo/pdal.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/geo/qlandkartegt.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/graphics/openimageio.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/graphics/openscenegraph.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/graphics/ufraw.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/japanese/mecab,-ipadic.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/lang/pfe.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/mail/kopano/core.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/math/arpack.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/math/cblas.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/math/plplot,-c++.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/math/py-scipy.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/misc/openbabel.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/multimedia/synfig.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/net/castget.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/net/strongswan.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/productivity/aqbanking.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/security/aircrack-ng.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/sysutils/sleuthkit.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/telephony/asterisk,imap,-calendar.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/textproc/mupdf,js.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/www/chromium.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/www/mozilla-firefox.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/x11/e17/e.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/x11/gnome/builder.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/x11/gnome/gjs.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/x11/gtk+4,-cloudprint.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/x11/kde4/kopete.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/x11/kde4/zeroconf-ioslave.log http://build-failures.rhaalovely.net/aarch64/2019-05-13/x11/qt5/qt3d,,-main.log recurrent failures failures/audio/chromaprint.log failures/comms/gnuradio.log failures/comms/lcdproc.log failures/databases/sqlports.log failures/devel/libcoap.log failures/editors/xwpe.log failures/games/frozen-bubble,-main.log failures/games/vacuum.log failures/geo/qlandkartegt.log failures/graphics/openimageio.log failures/graphics/openscenegraph.log failures/graphics/ufraw.log failures/japanese/mecab,-ipadic.log failures/lang/pfe.log failures/mail/kopano/core.log failures/math/arpack.log failures/math/cblas.log failures/math/plplot,-c++.log failures/math/py-scipy.log failures/misc/openbabel.log failures/net/castget.log failures/net/strongswan.log failures/productivity/aqbanking.log failures/security/aircrack-ng.log failures/sysutils/sleuthkit.log failures/telephony/asterisk,imap,-calendar.log failures/www/chromium.log failures/www/mozilla-firefox.log failures/x11/gnome/gjs.log failures/x11/kde4/kopete.log failures/x11/kde4/zeroconf-ioslave.log failures/x11/qt5/qt3d,,-main.log new failures +++ ls-failures Fri May 17 06:45:25 2019 +failures/devel/kdevelop.log +failures/geo/pdal.log +failures/multimedia/synfig.log +failures/textproc/mupdf,js.log +failures/x11/e17/e.log +failures/x11/gnome/builder.log +failures/x11/gtk+4,-cloudprint.log resolved failures --- ../old/aarch64/last//ls-failuresTue May 7 12:30:33 2019 -failures/astro/kstars.log -failures/games/cataclysm-dda,no_x11.log -failures/graphics/digikam-kde4,-dcraw.log -failures/mail/pecl-mailparse,php71.log -failures/math/R.log
Re: [PATCH] portgen(1) man page: Add py type
On 2019/05/16 12:01, Andrew Hewus Fresh wrote: > I'm also not sure if there's a way to tell python.port.mk to use the > pthon3 FLAVOR (if it exists) when doing update-plist automatically, but > that would be more helpful than the special case in portgen. it *definitely* should not do that.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2019/05/17 06:42:45 Modified files: security/opendnssec: Makefile distinfo Log message: Update opendnssec 2.1.3 -> 2.1.4 Announcement: https://www.opendnssec.org/2019/05/opendnssec-2-1-4/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2019/05/17 06:21:08 Modified files: plan9/drawterm : Makefile distinfo Log message: Update to drawterm-20170319 (5c953ddd29fa) from maintainer Stanley Lieber
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/05/17 06:11:31 Modified files: x11/gtk+2/patches: patch-gtk_gtkmountoperation-x11_c x11/gtk+3/patches: patch-gtk_gtkmountoperation-x11_c x11/gtk+4/patches: patch-gtk_gtkmountoperation-x11_c Log message: Merged upstream.
PATCH: new options for update-plist
Please try this instead.
What this does:
adds two complementary options to update-plist:
-c maybe_comment
-I maybe_ignored
For python, that would be
UPDATE_PLIST_ARGS += -c MODPY_PYCACHE -I MODPY_COMMENT
maybe_ignored is a variable that may expand to nothing
depending on the flavor, and maybe_comment is a variable
that may expand to @comment depending on the flavor.
This patch replaces write_restate with a 2-pass algorithm.
First pass prepares the substituted lines.
Second line does write stuff to the files.
The way the variables work is as follows:
- first pass counts keyed items for each plist, by making the
ignored vars vanish, and normalizing directories.
- second pass notices keyed items that would be duplicated,
and injects ${MODPY_COMMENT} at the beginning of the line.
Yes, it's waaay more intricate than what you suggested,
but it could be used in other scenarios instead of being
python-only.
Of course, this does require testing. I may have made some
stupid mistake somewhere.
Index: infrastructure/bin/update-plist
===
RCS file: /cvs/ports/infrastructure/bin/update-plist,v
retrieving revision 1.173
diff -u -p -r1.173 update-plist
--- infrastructure/bin/update-plist 17 May 2019 10:24:18 - 1.173
+++ infrastructure/bin/update-plist 17 May 2019 12:00:28 -
@@ -52,7 +52,7 @@ package TrackedFile;
sub new
{
my ($class, $name, $ext) = @_;
- bless {name => $name, ext => $ext, items => []}, $class;
+ bless {name => $name, ext => $ext, items => [], items2 => []}, $class;
}
sub add
@@ -61,6 +61,25 @@ sub add
push(@{$self->{items}}, $item);
}
+sub add2
+{
+ my ($self, $item, $p) = @_;
+
+ if ($item->NoDuplicateNames) {
+ my $s = $p->subst->remove_ignored_vars($item->{prepared});
+ my $s2 = $p->subst->do($s);
+ if (defined (my $k = $item->keyword)) {
+ $s2 =~ s/^\@\Q$k\E\s//;
+ }
+ $p->{stash}{$s2}++;
+
+ if ($s ne $item->{prepared}) {
+ $item->{candidate_for_comment} = $s2;
+ }
+ }
+ push(@{$self->{items2}}, $item);
+}
+
sub fh
{
my $self = shift;
@@ -87,6 +106,16 @@ sub next_item
}
}
+sub next_item2
+{
+ my $self = shift;
+ if (@{$self->{items2}} != 0) {
+ return shift @{$self->{items2}};
+ } else {
+ return undef;
+ }
+}
+
package TrackFile;
sub new
@@ -125,6 +154,25 @@ sub write_all
while (my $file = pop @stack) {
while (my $j = $file->next_item) {
+ my $filename = $j->prepare_restate($file, $p);
+ if (defined $filename) {
+ push(@stack, $file);
+ $file = $self->file($filename);
+ }
+ }
+ }
+ }
+
+ for my $i (@{$p->{base_plists}}) {
+ # we mimic the way pkg_create writes files
+ $p->{restate} = {};
+
+ my @stack = ();
+ push(@stack, $self->file($i));
+
+
+ while (my $file = pop @stack) {
+ while (my $j = $file->next_item2) {
my $filename = $j->write_restate($file, $p);
if (defined $filename) {
push(@stack, $file);
@@ -390,12 +438,33 @@ sub write_restate
return undef;
}
+sub prepare_restate
+{
+ my ($o, $file, $p) = @_;
+ $o->prepare_backsubst($file, $p);
+ return undef;
+}
+
+sub prepare_backsubst
+{
+ my ($o, $file, $p) = @_;
+ my $s = $p->subst->do_backsubst($o->fullstring, $o->unsubst, $o);
+ $o->{prepared} = $s;
+ $file->add2($o, $p);
+}
+
# default backsubstitution and writing.
sub write_backsubst
{
my ($o, $file, $p) = @_;
- my $s = $p->subst->do_backsubst($o->fullstring, $o->unsubst, $o);
- print {$file->fh} $s, "\n";
+
+ if (defined (my $s = $o->{candidate_for_comment})) {
+ if ($p->{stash}{$s} > 1) {
+ $o->{prepared} =
+ '${'.$p->subst->{maybe_comment}.'}'.$o->{prepared};
+ }
+ }
+ print {$file->fh} $o->{prepared}, "\n";
}
# extra objects that get copied very late (e.g., @extra)
@@ -665,10 +734,11 @@ sub tie_objects
}
# we will never do backsubst on CVSTags
-sub write_backsubst
+sub prepare_backsubst
{
my ($o, $file, $p) = @_;
- $o->write($file->fh);
+ $o->{prepared} = $o->fullstring;
+ $file->add2($o, $p);
}
# this is extra stuff that PkgCreate builds but that we don't want to copy
@@ -694,6 +764,10 @@ sub write_restate
{
}
+sub prepare_restate
+{
+}
+
package
Re[3]: UPDATE: devel/boehm-gc (7.6.0 => 7.6.12)
> I can't download 7.6.12.
Now it is available on $MASTER_SITES:
https://www.hboehm.info/gc/gc_source/gc-7.6.12.tar.gz
>Среда, 15 мая 2019, 11:40 +03:00 от Ivan Maidanski :
>
>> I can't download 7.6.12.
>
>Sorry, I've forgot to check it is there. I've just sent a request to Hans
>Boehm to add this tarball.
>It should be there in a couple of days, or alternately you can fetch it from
>https://github.com/ivmai/bdwgc/releases/download/v7.6.12/gc-7.6.12.tar.gz
>
>
>>Среда, 15 мая 2019, 0:59 +03:00 от Nam Nguyen < n...@berkeley.edu >:
>>
>>Stuart Henderson writes:
>>
>>> On 2019/05/14 23:31, Ivan Maidanski wrote:
Hello,
Here's a patch to update boehm-gc to v7.6.12 and libatomic_ops to v7.6.10.
gc v7.6.0 was an experimental release not intended for the production code.
>>>
>>>
>>>
>>> On which arches has this been tested?
>>
>>I can't download 7.6.12. Was this a typo?
>>
>>Pasting my diff for 8.0.4 (from
>>https://marc.info/?l=openbsd-ports=155721770419329=2 ). An important
>>change is the new configure flag `--enable-static=yes'
>>
>>Removed maintainer request since I don't understand the
>>platform-dependent parts. Feel free to merge it with what you have if it
>>helps.
>>
>>Index: Makefile
>>===
>>RCS file: /cvs/ports/devel/boehm-gc/Makefile,v
>>retrieving revision 1.70
>>diff -u -p -u -p -r1.70 Makefile
>>--- Makefile 30 Dec 2018 17:08:09 - 1.70
>>+++ Makefile 14 May 2019 21:12:26 -
>>@@ -3,50 +3,50 @@
>> COMMENT-main=garbage collection and memory leak detection for C and
>>C++
>> COMMENT-atomic= access to hardware provided atomic memory operations
>>
>>-VERSION= 7.6.0
>>-LIBAO_VERSION= 7.6.6
>>+VERSION= 8.0.4
>>+LIBAO_VERSION= 7.6.10
>>
>> DISTNAME=gc-${VERSION}
>>
>> PKGNAME-atomic= libatomic_ops-${LIBAO_VERSION}
>> PKGNAME-main=boehm-gc-${VERSION}
>>-REVISION-main= 2
>>
>> DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
>> libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX}
>>
>> MULTI_PACKAGES= -main -atomic
>>
>>-SHARED_LIBS += gc 4.0 # 1.3
>>-SHARED_LIBS += gccpp 0.0 # 1.3
>>-SHARED_LIBS += cord2.3 # 1.3
>>-SHARED_LIBS += atomic_ops 2.0 # 1.3
>>-SHARED_LIBS += atomic_ops_gpl 2.0 # 1.3
>>+SHARED_LIBS+=gc 5.0 # 5.3
>>+SHARED_LIBS+=gccpp 0.1 # 5.0
>>+SHARED_LIBS+=cord2.3 # 5.0
>>+SHARED_LIBS+=atomic_ops 2.0 # 2.1
>>+SHARED_LIBS+=atomic_ops_gpl 2.0 # 2.2
>>
>> CATEGORIES= devel
>>
>> MASTER_SITES=${HOMEPAGE}gc_source/
>>
>>-HOMEPAGE= http://hboehm.info/gc/
>>+HOMEPAGE= https://hboehm.info/gc/
>>
>> # currently works only on most ELF archs
>> NOT_FOR_ARCHS= m88k
>>
>> PERMIT_PACKAGE_CDROM=Yes
>>
>>-WANTLIB-main += m pthread ${COMPILER_LIBCXX}
>>+WANTLIB-main+= m pthread ${COMPILER_LIBCXX}
>>
>>-COMPILER = base-clang ports-gcc base-gcc
>>+COMPILER=base-clang ports-gcc base-gcc
>>
>> MAKE_ENV=CP="cp" \
>> INSTALL_DATA="${INSTALL_DATA}" \
>> INSTALL_MAN="${INSTALL_MAN}"
>>
>>-CONFIGURE_STYLE= gnu
>>+CONFIGURE_STYLE= gnu
>>
>>-CONFIGURE_ARGS= --with-libatomic-ops=no \
>>+CONFIGURE_ARGS= --with-libatomic-ops=no \
>> --enable-cplusplus \
>>- --enable-threads=pthreads
>>+ --enable-threads=pthreads \
>>+ --enable-static=yes
>>
>> post-extract:
>> @perl -pi -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/doc/gc.man
>>Index: distinfo
>>===
>>RCS file: /cvs/ports/devel/boehm-gc/distinfo,v
>>retrieving revision 1.11
>>diff -u -p -u -p -r1.11 distinfo
>>--- distinfo 30 Dec 2018 17:08:09 - 1.11
>>+++ distinfo 14 May 2019 21:12:26 -
>>@@ -1,4 +1,4 @@
>>-SHA256 (gc-7.6.0.tar.gz) = oUoosRKb6Q5VzW9xEn/8VZThCR1dVBMVKMJM0MA7fZA=
>>-SHA256 (libatomic_ops-7.6.6.tar.gz) =
>>mf6rxfVId/MU20+t6xCfCz4dGlSvtrSz37oecH444HQ=
>>-SIZE (gc-7.6.0.tar.gz) = 751
>>-SIZE (libatomic_ops-7.6.6.tar.gz) = 498187
>>+SHA256 (gc-8.0.4.tar.gz) = Q2oN3GexrAsEBbYalnW8qeB1yBVvTevR0G86VsfNKJ0=
>>+SHA256 (libatomic_ops-7.6.10.tar.gz) =
>>WH7fYIF/Vtrx4as4pLPHKbjoRv9ntPYqYVcYNwjwma8=
>>+SIZE (gc-8.0.4.tar.gz) = 1160528
>>+SIZE (libatomic_ops-7.6.10.tar.gz) = 503734
>>Index: patches/patch-bdw-gc_pc_in
>>===
>>RCS file: /cvs/ports/devel/boehm-gc/patches/patch-bdw-gc_pc_in,v
>>retrieving revision 1.1
>>diff -u -p -u -p -r1.1 patch-bdw-gc_pc_in
>>--- patches/patch-bdw-gc_pc_in9 Dec 2009 20:36:49 - 1.1
>>+++ patches/patch-bdw-gc_pc_in14 May 2019 21:12:26 -
>>@@ -1,10 +1,11 @@
>> $OpenBSD: patch-bdw-gc_pc_in,v 1.1 2009/12/09 20:36:49 sthen Exp $
>> bdw-gc.pc.in.orig
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/05/17 04:24:18 Modified files: infrastructure/bin: update-plist Log message: make code clearer, do not declare a 2nd local i.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/05/17 04:04:13 Modified files: infrastructure/lib/OpenBSD: ReverseSubst.pm Log message: put empty_backsubst into its own function. fix buglet: call adjust anyhow (from afresh1@)
