Re: fonts/noto/cjk: Use EXTRACT_FILES
Klemens Nanni writes: > Use unzip(1) options and extract what's needed instead of removing files > afterwards. > > Cuts WRKDIR from 2.1G to 260M; no PLIST change. > > Feedback? OK? I'd prefer to leave the port as is. Noto distfiles change structure often; whitelisting patterns to extract would make it easy to miss when new font families or file formats are added.
Re: portcheck: do not warn about extra file for modules.inc
On Mon, 24 May 2021 18:18:44 +0300, Vadim Zhukov
wrote:
> > Anyway, here's the new version of the diff:
> >
> > diff efc26b0628a018a694a05768ccbc773a0ed2e5ad /usr/ports
> > blob - bb8568b21b82fed260785c869a3cecfc4d4816cb
> > file + infrastructure/bin/portcheck
> > --- infrastructure/bin/portcheck
> > +++ infrastructure/bin/portcheck
> > @@ -612,6 +612,13 @@ check_port_dir() {
> > portmk_exists=true
> > ;;
> >
> > + modules.inc)
> > + test -f "$F" || err "$F is not a file"
> > + egrep -q '\.include "\./modules\.inc"'
> > "$dir"/Makefile ||
> > + err "$F not included in Makefile"
>
> I'd recommend the following line instead:
>
> fgrep -qx '.include "./modules.inc"'
>
> This will catch more cases, including commented out lines, and reads
> easier, IMO. :-) With it, fine by me.
I initially didn't read the emails and just blindly tried Paco's diff
and indeed it didn't catch the commented-out-to-test line.
I agree the fgrep is easier to read (and it does catch the commented
out line), ok danj@ with it.
Cheers,
Daniel
Re: [MAINTAINER UPDATE] devel/sord -> 0.16.8
On Sun, May 30 2021, Dimitri Karamazov wrote: > Simple for devel/sord to 0.16.8 > > Changelog:https://drobilla.net/category/sord/ > > No dynamic export changes This... > External reference changes: > added: > fwrite > > removed: > fprintf > > PLT removed: > sord_contains > sord_inserter_new > sord_iter_get_node > sord_new_uri > sord_node_copy > sord_node_get_string > sord_num_quads > sord_search > sord_write_iter > > Index: Makefile > === > RCS file: /cvs/ports/devel/sord/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 24 May 2021 20:27:30 - 1.1.1.1 > +++ Makefile 30 May 2021 15:48:31 - > @@ -2,9 +2,9 @@ > > COMMENT= lightweight C library for storing RDF data in memory > > -DISTNAME=sord-0.16.4 > +DISTNAME=sord-0.16.8 > > -SHARED_LIBS= sord-0 0.0 # 0.16 > +SHARED_LIBS= sord-0 1.0 # 0.16 means that you don't need to bump the shared lib major version. Unless you know that an incompatible change has been introduced and can't be spotted by /usr/src/lib/check_sym. > CATEGORIES= devel > > Index: distinfo > === > RCS file: /cvs/ports/devel/sord/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 24 May 2021 20:27:30 - 1.1.1.1 > +++ distinfo 30 May 2021 15:48:31 - > @@ -1,2 +1,2 @@ > -SHA256 (sord-0.16.4.tar.bz2) = sVmY9OetlYIBNGAJR31mlukO5dPpr/JefpvgdDcmkNc= > -SIZE (sord-0.16.4.tar.bz2) = 510920 > +SHA256 (sord-0.16.8.tar.bz2) = fCidLqq/gvpqwhkQfOYy1wRnLc+5ZuGn/wu8TOk/XhQ= > +SIZE (sord-0.16.8.tar.bz2) = 525038 > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Fwd: UPDATE: VLC 3.0.14
On Thu, May 27, 2021 at 02:58:35PM -0400, Brad Smith wrote:
> Able to take a look at this when you have some free time?
>
>
Thanks for the tests; the problem is present in 3.0.12 as well: an
use-after-free caused by calls to the mute/volume functions after the
handle is freed.
OK?
If you've a good contact upstream, it's worth showing them the diff, i
can submit it as well, if you prefer.
Index: Makefile
===
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.248
diff -u -p -u -p -r1.248 Makefile
--- Makefile3 Apr 2021 11:15:46 - 1.248
+++ Makefile31 May 2021 19:28:06 -
@@ -7,7 +7,7 @@ V= 3.0.12
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
-REVISION-main= 0
+REVISION-main= 1
CATEGORIES=x11
MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
Index: patches/patch-modules_audio_output_sndio_c
===
RCS file: patches/patch-modules_audio_output_sndio_c
diff -N patches/patch-modules_audio_output_sndio_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_audio_output_sndio_c 31 May 2021 19:28:06 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Set volume/mute function pointers when handle is freed, to ensure
+sio_setvol() is not called on a freed handle. Fixes crashes when
+volume is adjusted while playback is stopped.
+
+Index: modules/audio_output/sndio.c
+--- modules/audio_output/sndio.c.orig
modules/audio_output/sndio.c
+@@ -208,6 +208,8 @@ static void Stop (audio_output_t *aout)
+ {
+ aout_sys_t *sys = aout->sys;
+
++aout->volume_set = NULL;
++aout->mute_set = NULL;
+ sio_close (sys->hdl);
+ }
+
> Forwarded Message
> Subject: Re: UPDATE: VLC 3.0.14
>Date: Wed, 19 May 2021 15:01:49 +0200
>From: Mark Patruck
> To: Brad Smith
>
>
> On 5/18/21 7:55 AM, Mark Patruck wrote:
>
> On 5/16/21 6:13 PM, Brad Smith wrote:
>
> Here is an update to VLC 3.0.14.
>
>
> Builds and runs fine on amd64, thanks Brad.
>
>
> When trying to change the volume w/o anything playing, vlc segfaults
>
> andromeda$ egdb vlc vlc.core
> GNU gdb (GDB) 7.12.1
> Copyright (C) 2017 Free Software Foundation, Inc.
> License GPLv3+: GNU GPL version 3 or later
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law. Type "show copying"
> and "show warranty" for details.
> This GDB was configured as "x86_64-unknown-openbsd6.9".
> Type "show configuration" for configuration details.
> For bug reporting instructions, please see:
>
Re: [Maintainer Update] devel/glog: 0.4.0 -> 0.5.0
Ping again.
>> Attached diff updates devel/glog from 0.4.0 to 0.5.0.
>>
>> The changelog can be viewed here:
>>
>> https://github.com/google/glog/releases/tag/v0.5.0
>>
>> Changes included upstreaming of the PowerPC-specific patch in our
>> tree. It also appears the hack for sparc64, arm64 and mips may no longer
>> be required.
>>
>> There's been quite a bit of upstream churn, as such we need to do a
>> version bump also.
>>
>> Tested on amd64 and it seems to be working as well as it did prior to
>> the update. It looks like everything in the tree that actually uses glog
>> vendors their own copy, so don't expect any repercussions on other ports.
>>
>> Thanks,
Index: devel/glog/Makefile
===
RCS file: /cvs/ports/devel/glog/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- devel/glog/Makefile 5 Mar 2021 01:24:44 - 1.19
+++ devel/glog/Makefile 15 May 2021 21:19:25 -
@@ -4,10 +4,9 @@ COMMENT = C++ application-level logging
GH_ACCOUNT = google
GH_PROJECT = glog
-GH_TAGNAME = v0.4.0
-REVISION = 1
+GH_TAGNAME = v0.5.0
-SHARED_LIBS += glog 2.0 # 0.2.1
+SHARED_LIBS += glog 3.0 # 0.5.0
CATEGORIES = devel
Index: devel/glog/distinfo
===
RCS file: /cvs/ports/devel/glog/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- devel/glog/distinfo 26 Nov 2020 20:37:13 - 1.6
+++ devel/glog/distinfo 15 May 2021 21:19:25 -
@@ -1,2 +1,2 @@
-SHA256 (glog-0.4.0.tar.gz) = 8oNZrroS8w1z2eRxHvNW3IQohpaBEhYrxzACZFE5w5w=
-SIZE (glog-0.4.0.tar.gz) = 200955
+SHA256 (glog-0.5.0.tar.gz) = 7t5x8oNxvzmqabRd4jsynTchQBbiBVJps7Xnz9QLWfU=
+SIZE (glog-0.5.0.tar.gz) = 183346
Index: devel/glog/patches/patch-src_stacktrace_powerpc-inl_h
===
RCS file: devel/glog/patches/patch-src_stacktrace_powerpc-inl_h
diff -N devel/glog/patches/patch-src_stacktrace_powerpc-inl_h
--- devel/glog/patches/patch-src_stacktrace_powerpc-inl_h 27 Apr 2020 15:45:46 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_stacktrace_powerpc-inl_h,v 1.1 2020/04/27 15:45:46 cwen Exp $
-
-Fix the lack of _CALL_SYSV on powerpc with clang, from:
-https://github.com/google/glog/pull/545
-
-Index: src/stacktrace_powerpc-inl.h
src/stacktrace_powerpc-inl.h.orig
-+++ src/stacktrace_powerpc-inl.h
-@@ -114,7 +114,7 @@ int GetStackTrace(void** result, int max_depth, int sk
- #elif defined(__APPLE__) || ((defined(__linux) || defined(__linux__)) && defined(__PPC64__))
- // This check is in case the compiler doesn't define _CALL_AIX/etc.
- result[n++] = *(sp+2);
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__OpenBSD__)
- // This check is in case the compiler doesn't define _CALL_SYSV.
- result[n++] = *(sp+1);
- #else
Index: devel/glog/patches/patch-src_symbolize_unittest_cc
===
RCS file: devel/glog/patches/patch-src_symbolize_unittest_cc
diff -N devel/glog/patches/patch-src_symbolize_unittest_cc
--- devel/glog/patches/patch-src_symbolize_unittest_cc 5 Mar 2021 01:25:08 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_symbolize_unittest_cc,v 1.1 2021/03/05 01:25:08 kmos Exp $
-
-This test causes problems on (at least) sparc64 and mips64. It appears they try
-to call this even though those functions don't exist for those archs.
-
-Index: src/symbolize_unittest.cc
src/symbolize_unittest.cc.orig
-+++ src/symbolize_unittest.cc
-@@ -402,7 +402,7 @@ int main(int argc, char **argv) {
- InitGoogleLogging(argv[0]);
- InitGoogleTest(&argc, argv);
- #if defined(HAVE_SYMBOLIZE)
--# if defined(__ELF__)
-+# if defined(__ELF__) && defined(TEST_X86_32_AND_64)
- // We don't want to get affected by the callback interface, that may be
- // used to install some callback function at InitGoogle() time.
- InstallSymbolizeCallback(NULL);
Index: devel/glog/pkg/PLIST
===
RCS file: /cvs/ports/devel/glog/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- devel/glog/pkg/PLIST 26 Nov 2020 20:37:13 - 1.5
+++ devel/glog/pkg/PLIST 15 May 2021 21:19:25 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2020/11/26 20:37:13 sthen Exp $
include/glog/
+include/glog/export.h
include/glog/log_severity.h
include/glog/logging.h
include/glog/raw_logging.h
@@ -8,6 +9,8 @@ include/glog/vlog_is_on.h
lib/cmake/glog/
lib/cmake/glog/glog-config-version.cmake
lib/cmake/glog/glog-config.cmake
+lib/cmake/glog/glog-modules.cmake
lib/cmake/glog/glog-targets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/glog/glog-targets.cmake
@lib lib/libglog.so.${LIBglog_VERSION}
+lib/pkgconfig/libglog.pc
Re: net/catgirl:
On Sat, 29 May 2021, Klemens Nanni wrote:
> A few "quality of life" improvements, notably:
>
> 1deee3c Improve missing param behavior for /msg, /whois, /ns, /cs
> 3734317 Tag config options in manual
> 6d5bcf7 Hash the username in kiosk mode
> 27c9678 Clarify -H hash option
> 868c604 Use reverse video not colors for topic change when disabled
> 6207aaf Ignore messages in reply to previously ignored messages
> 94f79e8 Reset formatting after realnames
> cfd5bf2 Set id color from completion in /msg
> 63bffae Always show 341 RPL_INV
>
> Works fine on amd64 and sparc64.
>
> OK?
I've been using it since you sent it without any issues on amd64.
ok paco@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/catgirl/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 24 Mar 2021 21:37:17 - 1.9
> +++ Makefile 9 May 2021 22:40:20 -
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.9 2021/03/24 21:37:17 kn Exp $
>
> COMMENT =curses TLS-only IRC client
> -DISTNAME = catgirl-1.7
> +DISTNAME = catgirl-1.8
>
> CATEGORIES = net
>
> @@ -26,8 +26,7 @@ MASTER_SITES = https://git.causal.agency
>
> NO_TEST =Yes
>
> -FAKE_FLAGS = PREFIX=${PREFIX} \
> - MANDIR=${PREFIX}/man
> +FAKE_FLAGS = PREFIX=${PREFIX}
>
> EXAMPLES = ${PREFIX}/share/examples/catgirl
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/catgirl/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 24 Mar 2021 21:37:17 - 1.5
> +++ distinfo 29 May 2021 20:41:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (catgirl-1.7.tar.gz) = 3shSdeq4l6Y5DEJZEVMHAngp6vjnkPjzpLpcp407X/0=
> -SIZE (catgirl-1.7.tar.gz) = 60329
> +SHA256 (catgirl-1.8.tar.gz) = LvaWBmQPJcppW8ZdDdnhb1+jYYT+s40SU6Vkja1od2s=
> +SIZE (catgirl-1.8.tar.gz) = 60915
>
--
Paco Esteban.
0x5818130B8A6DBC03
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Sun May 30 18:08:33 MDT 2021 Finished: Mon May 31 04:48:52 MDT 2021 Duration: 0 Days 10 hours 40 minutes Built using OpenBSD 6.9-current (GENERIC.MP) #838: Sun May 30 12:45:31 MDT 2021 Built 5371 packages Number of packages built each day: May 30: 4592 May 31: 779 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2021-05-30/summary.log Build failures: 48 http://build-failures.rhaalovely.net/sparc64/2021-05-30/databases/ruby-amalgalite,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/databases/ruby-ldap,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/databases/ruby-sequel,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/databases/ruby-sqlite3,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-cicphash,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-daemons,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-ffi,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-kgio,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-narray,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-ncurses,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-nio4r,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-prof,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-racc,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-ref,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-subset_sum,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/devel/ruby-yajl,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/editors/zile.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/graphics/cfdg.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/lang/guile2.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/lang/python/3.8.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/lang/python/3.9,-gdbm.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/lang/racket-minimal.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/lang/ruby/2.6,-gdbm.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/lang/ruby/2.7.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/mail/ruby-mini_mime,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/math/ntl.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/math/py-numpy.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/net/ruby-cbor,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/net/ruby-eventmachine,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/net/ruby-msgpack,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/net/ruby-public_suffix,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/security/ruby-bcrypt,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/security/ruby-pledge,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/sysutils/ruby-shadow,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/textproc/ruby-fast-stemmer,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/textproc/ruby-fast_xs,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/textproc/ruby-hpricot,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/textproc/ruby-hyperestraier,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/textproc/ruby-rdiscount,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/textproc/ruby-redcarpet,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/textproc/ruby-redcloth,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/www/ruby-fcgi,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/www/ruby-ntlm,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/www/ruby-rack-test,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/www/ruby-raindrops,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/www/ruby-websocket-extensions,ruby30.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/www/w3m.log http://build-failures.rhaalovely.net/sparc64/2021-05-30/x11/ruby-tk,ruby30.log
UPDATE: net/nextcloudclient-3.2.2
Hi.
Update for net/nextcloudclient v3.2.2.
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.2.2
Thank you for testing.
--
Adriano Barbosa
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 6 May 2021 12:43:34 - 1.18
+++ Makefile 31 May 2021 14:20:34 -
@@ -2,9 +2,8 @@
COMMENT = desktop sync client for Nextcloud
-V = 3.2.1
+V = 3.2.2
DISTNAME = nextcloudclient-${V}
-REVISION = 0
GH_ACCOUNT = nextcloud
GH_PROJECT = desktop
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 2 May 2021 14:59:45 - 1.15
+++ distinfo 31 May 2021 14:20:34 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.2.1.tar.gz) = 8tOH01J26m5to64znt49ib6B3Ur3NXOewoBwkAjrZkU=
-SIZE (nextcloudclient-3.2.1.tar.gz) = 15234115
+SHA256 (nextcloudclient-3.2.2.tar.gz) = fJB9Ly6AsYNs4o/xmGSaIyDcbOWOJdt8iUE3I7FKUl4=
+SIZE (nextcloudclient-3.2.2.tar.gz) = 15398900
[update] openvpn-auth-ldap 2.0.4
Hi,
there's been a new release on github in 2019, after the last one we're
still shipping from 2007.. cf
https://github.com/threerings/openvpn-auth-ldap/releases/tag/auth-ldap-2.0.4
i know nothing to obj-c so i randomly poked thing around until this
built fine. runtime testing welcome, as apparently the "modern runtime"
patches didnt make it upstream anyway. Remove some patches while here,
but dunno if they're needed at runtime.. ccing our objc expert :)
Landry
? patches-no
Index: Makefile
===
RCS file: /cvs/ports/net/openvpn-auth-ldap/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile16 Aug 2020 20:37:45 - 1.25
+++ Makefile31 May 2021 14:53:55 -
@@ -2,9 +2,10 @@
COMMENT = LDAP authentication plugin for OpenVPN 2.x
-VERSION = 2.0.3
-REVISION = 14
-DISTNAME = auth-ldap-${VERSION}
+VERSION = 2.0.4
+GH_ACCOUNT = threerings
+GH_PROJECT = openvpn-auth-ldap
+GH_TAGNAME = auth-ldap-${VERSION}
PKGNAME = openvpn-${DISTNAME}
CATEGORIES = net security
@@ -18,12 +19,9 @@
MODULES = x11/gnustep
MODGNUSTEP_NEEDS_GUI = No
-MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=openvpn-auth-ldap/}
-
RUN_DEPENDS = net/openvpn
LIB_DEPENDS = databases/openldap
BUILD_DEPENDS =${RUN_DEPENDS} \
- devel/check \
devel/re2c
SEPARATE_BUILD = Yes
@@ -37,8 +35,7 @@
LDFLAGS += -lc++abi -lpthread
.endif
-CONFIGURE_ARGS = --with-check=${LOCALBASE} \
- --with-openldap=${LOCALBASE} \
+CONFIGURE_ARGS = --with-openldap=${LOCALBASE} \
--with-openvpn=${LOCALBASE}/include/openvpn \
CC="${CC}" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
Index: distinfo
===
RCS file: /cvs/ports/net/openvpn-auth-ldap/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:44 - 1.2
+++ distinfo31 May 2021 14:53:55 -
@@ -1,2 +1,2 @@
-SHA256 (auth-ldap-2.0.3.tar.gz) = KyWGELDz/pzgl7Doi0x45ALl8/gUt9MnOSunJXTRtjo=
-SIZE (auth-ldap-2.0.3.tar.gz) = 261832
+SHA256 (openvpn-auth-ldap-auth-ldap-2.0.4.tar.gz) =
gfYAzciK2yJY9X3x7S2H8K+pRfZsv4iXrVDnb0JQkWg=
+SIZE (openvpn-auth-ldap-auth-ldap-2.0.4.tar.gz) = 209800
Index: patches/patch-aclocal_m4
===
RCS file: /cvs/ports/net/openvpn-auth-ldap/patches/patch-aclocal_m4,v
retrieving revision 1.1
diff -u -r1.1 patch-aclocal_m4
--- patches/patch-aclocal_m419 Jun 2017 21:02:11 - 1.1
+++ patches/patch-aclocal_m431 May 2021 14:53:55 -
@@ -1,14 +1,14 @@
-$OpenBSD: patch-aclocal_m4,v 1.1 2017/06/19 21:02:11 sebastia Exp $
+$OpenBSD$
Index: aclocal.m4
--- aclocal.m4.orig
+++ aclocal.m4
@@ -1,4 +1,3 @@
--builtin(include,objc.m4)
- builtin(include,pthread.m4)
+-builtin(include,pthread.m4)
builtin(include,platform.m4)
- builtin(include,check.m4)
-@@ -23,7 +22,7 @@ builtin(include,check.m4)
+ builtin(include,framework.m4)
+
+@@ -22,7 +21,7 @@ builtin(include,framework.m4)
# Result is cached.
#
# Defines one of the following preprocessor macros:
@@ -17,7 +17,7 @@
#
# Substitutes the following variables:
# OBJC_RUNTIME OBJC_RUNTIME_FLAGS OBJC_LIBS
-@@ -31,7 +30,7 @@ builtin(include,check.m4)
+@@ -30,7 +29,7 @@ builtin(include,framework.m4)
#
AC_DEFUN([OD_OBJC_RUNTIME],[
AC_REQUIRE([AC_PROG_OBJC])
@@ -26,7 +26,7 @@
if test x"${with_objc_runtime}" != x; then
case "${with_objc_runtime}" in
-@@ -39,8 +38,10 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
+@@ -38,8 +37,10 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
;;
apple)
;;
@@ -38,30 +38,30 @@
;;
esac
fi
-@@ -57,7 +58,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
- OLD_OBJCFLAGS="${OBJCFLAGS}"
-
- # Add -lobjc. The following tests will ensure that the library exists
and functions with the detected Objective C compiler
-- LIBS="${LIBS} -lobjc"
-+ LIBS="${LIBS} -lobjc2"
+@@ -58,7 +59,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
+ # Add -lobjc and -fobjc-exceptions. The following tests will ensure
that the library exists and
+ # functions with the detected Objective C compiler
+ OBJCFLAGS="${OBJCFLAGS} -fobjc-exceptions"
+- LIBS="${LIBS} -lobjc -fobjc-exceptions"
++ LIBS="${LIBS} -lobjc2 -fobjc-exceptions"
# Test if pthreads are required to link against
# libobjc - this is the case on FreeBSD.
-@@ -112,11 +113,11 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
+@@ -113,11 +114,11 @@ AC_DEFUN([O
Re: [update] textproc/libxml
Ping. Diff is repasted below.
Nam Nguyen writes:
> Moritz Buhl writes:
>
>> Hi ports@,
>>
>> A new libxml release is out (two actally)
>> http://www.xmlsoft.org/news.html
>> https://gitlab.gnome.org/GNOME/libxml2/-/commit/b48e77cf4f6fa0792c5f4b639707a2b0675e461b
>>
>> This fixes CVE-2021-3541.
>>
>> I updated the version and removed previous patches for CVE-2021-3537
>> and CVE-2020-7595.
>>
>> make test passes with no errors.
>>
>> mbuhl
>
> Thanks for this. It is similar to something I have in mystuff. This
> does not incorporate daniel@'s diff for unbreaking python 3.9 yet.
>
> Here is a fresh diff with some additions:
> - major bump
> - move to gnome's gitlab to avoid using ftp (as suggested by tj@)
> - CONFIGURE_STYLE autoreconf
> - translate patches from Makefile.in --> Makefile.am
> - remove parser.c CVE fixes already applied upstream
>
> Questions
> =
> Can I manually edit plist to remove the following?
> +lib/python${MODPY_VERSION}/
> +lib/python${MODPY_VERSION}/site-packages/
>
> explanation for major bump
> ==
> check_sym output: https://namtsui.com/public/libxml_check_sym.txt
>
> check_sym revealed that xmlPopOutputCallbacks is a new function (defined
> in ${WRKSRC}/include/libxml/xmlIO.h) justifying a minor bump.
>
> However, I diffed all headers and found two reasons for a major bump.
>
> Reason 1:
> https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce00c36e654f0a5291d48bc437e807daecbd8449
> void * *pushTab --> xmlStartTag *pushTab
> "'pushTab' was only used by the push parser... so the change to the
> public headers should be safe."
> Even though upstream states this, because it is in a public header, I
> think this can cause a major bump due to types changing in an
> incompatible way. (50% confidence)
>
> Reason 2:
> https://gitlab.gnome.org/GNOME/libxml2/-/commit/1fe385304f11332ddb232571d54d36a5aeca0398
> upstream claims never part of a public release, but the previous
> distfile has maxDepth and maxParserDepth. Removing this from the struct
> is reason for a major bump. (100% confidence)
>
> Testing
> ===
> I tested SUBPACKAGE=-python using texproc/itstool. `make test'
> passes. If there is positive feedback can this be put through a bulk?
> Feedback and tests are welcome. OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- Makefile12 May 2021 11:22:35 - 1.188
+++ Makefile15 May 2021 11:33:08 -
@@ -3,15 +3,13 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
-DISTNAME= libxml2-${VERSION}
+VERSION= 2.9.12
+DISTNAME= libxml2-v${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
-SHARED_LIBS += xml2 16.1 # 11.9
+SHARED_LIBS += xml2 17.0 # 11.9
CATEGORIES=textproc
-MASTER_SITES= ftp://xmlsoft.org/libxml/
+MASTER_SITES=
https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${VERSION}/
HOMEPAGE= http://xmlsoft.org/
@@ -23,8 +21,9 @@ WANTLIB= iconv lzma m z
LIB_DEPENDS= archivers/xz \
converters/libiconv
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.16
CONFIGURE_ARGS+= --enable-static \
--with-html-dir="${PREFIX}/share/doc" \
--with-html-subdir="libxml2/html" \
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- distinfo1 Nov 2019 15:37:45 - 1.57
+++ distinfo15 May 2021 11:33:08 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-v2.9.12.tar.gz) = mL+nqaXip1Y4QiBQdARI7p8Cv03CB1yYItd0fV/55hc=
+SIZE (libxml2-v2.9.12.tar.gz) = 5233674
Index: patches/patch-Makefile_am
===
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_am 15 May 2021 11:33:08 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+DEPS: Fix parallel build. gmake recognizes libxml2.la and ./libxml2.la
+as equivalent, ours does not.
+
+Index: Makefile.am
+--- Makefile.am.orig
Makefile.am
+@@ -57,7 +57,7 @@ libxml2_la_SOURCES = SAX.c entities.c encoding.c error
+ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
+ xmlmodule.c schematron.c xzlib.c
+
+-DEPS = $(top_builddir)/libxml2.la
++DEPS = libxml2.la
+ LDADDS =
