Re: UPDATE: john-jumbo to 1.9.0-jumbo-1

[Sebastian Reitenbach]

Am Freitag, November 27, 2020 13:19 CET, schrieb "Sebastian Reitenbach" 
:

> Hi,
>
> Am Freitag, November 27, 2020 11:15 CET, schrieb Stuart Henderson 
> :
>
> > Do the new examples files not need @sample?
>
> well spotted, I had my old (modified) /etc/john.conf laying around, so missed 
> some other things as well.
> Updated patch, also now with rules installed, below.

ping, anyone? Here's the patch again:

Index: Makefile
===
RCS file: /cvs/ports/security/john-jumbo/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile7 Apr 2020 13:29:52 -   1.22
+++ Makefile4 Dec 2020 06:00:57 -
@@ -4,9 +4,8 @@
 BROKEN-alpha = DES_bs.c:173: internal compiler error: in get_callee_fndecl, at 
tree.c:5940
 FIX_EXTRACT_PERMISSIONS=Yes

-V =1.8.0
+V =1.9.0
 JV =   1
-REVISION = 4
 EXTRACT_SUFX = .tar.xz

 DISTNAME = john-$V-jumbo-${JV}
@@ -14,17 +13,17 @@
 CATEGORIES =   security

 HOMEPAGE = https://www.openwall.com/john/
+MAINTAINER =   Sebastian Reitenbach 

 # files from various authors; see license review txt file
 PERMIT_PACKAGE =   Yes

-WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 pthread smime3
-WANTLIB += nssutil3 sqlite3 ssl ssl3 z
+WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 smime3
+WANTLIB += nssutil3 ssl ssl3 z

-MASTER_SITES = https://www.openwall.com/john/j/
+MASTER_SITES = https://www.openwall.com/john/k/

-LIB_DEPENDS =  databases/sqlite3 \
-   security/nss
+LIB_DEPENDS =  security/nss

 USE_GMAKE =Yes
 MAKE_FILE =Makefile.legacy
@@ -68,17 +67,17 @@
 ALL_TARGET=generic
 .endif

-BINS += SIPdump calc_stat cprepair genmkvpwd luks2john makechr
+BINS += SIPdump calc_stat cprepair genmkvpwd makechr
 BINS += mkvcalcproba raw2dyna tgtsnarf uaf2john vncpcap2john wpapcap2john

 do-configure:
perl -pi -e 's,\$$JOHN/john.conf,${SYSCONFDIR}/john.conf,' 
${WRKSRC}/params.h
rm ${WRKSRC}/KRB4_*_plug.c  # no old DES API support in LibreSSL
-   rm ${WRKSRC}/rawSHA0_fmt_plug.c # no SHA-0 support in LibreSSL

 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john/rules
${INSTALL_PROGRAM} ${WRKDIST}/run/john ${PREFIX}/bin
cd ${WRKDIST}/run; ${INSTALL_PROGRAM} ${BINS} ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKDIST}/run/mailer \
@@ -87,7 +86,9 @@
ln -sf john ${PREFIX}/bin/`basename $$i`; done
${INSTALL_DATA} ${WRKDIST}/run/*.{chr,conf,lst} \
${PREFIX}/share/examples/john
-   ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
+   ${INSTALL_DATA} ${WRKDIST}/run/rules/*.rule \
+   ${PREFIX}/share/examples/john/rules
+   cp -R ${WRKDIST}/doc/* ${PREFIX}/share/doc/john

 # not using TEST_TARGET as it gets confused by the quotes in CFLAGS
 do-test:
Index: distinfo
===
RCS file: /cvs/ports/security/john-jumbo/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo16 Jan 2015 15:40:01 -  1.3
+++ distinfo4 Dec 2020 06:00:57 -
@@ -1,2 +1,2 @@
-SHA256 (john-1.8.0-jumbo-1.tar.xz) = 
usk9AlmVoFHwVa29fOLxl1Z2ysbHSmx6PuTP3ZwWCSM=
-SIZE (john-1.8.0-jumbo-1.tar.xz) = 23232492
+SHA256 (john-1.9.0-jumbo-1.tar.xz) = 
9dEj+CmDxT2MxZjhdDlLB0vnp3dW9fte2FFZGMgefzs=
+SIZE (john-1.9.0-jumbo-1.tar.xz) = 33638768
Index: patches/patch-src_Makefile_legacy
===
RCS file: /cvs/ports/security/john-jumbo/patches/patch-src_Makefile_legacy,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Makefile_legacy
--- patches/patch-src_Makefile_legacy   24 Apr 2018 18:10:55 -  1.2
+++ patches/patch-src_Makefile_legacy   4 Dec 2020 06:00:57 -
@@ -2,7 +2,7 @@
 Index: src/Makefile.legacy
 --- src/Makefile.legacy.orig
 +++ src/Makefile.legacy
-@@ -1073,11 +1073,9 @@ openbsd-alpha:
+@@ -976,11 +976,9 @@ openbsd-alpha:
  openbsd-sparc64:
$(LN) sparc64.h arch.h
@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
@@ -16,7 +16,7 @@
@echo "All done"

  openbsd-sparc:
-@@ -1922,7 +1920,7 @@ generic: generic.h
+@@ -1718,7 +1716,7 @@ generic: generic.h
$(RM) arch.h
ln -s generic.h arch.h
@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
@@ -25,12 +25,12 @@

  generic.h:
$(RM) arch.h
-@@ -2307,7 +2305,7 @@ john.com: john.asm
+@@ -1919,7 +1917,7 @@ john.com: john.asm

  ../run/cprepair: cprepair.c unicode.c unicode.h options.h misc.h misc.c \
-   memdbg.h memdbg.c
+
 -  $(CC) -Wall -O3 -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c unicode.c \
 +  $(CC) -Wall $(COPTFLAGS) -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c 
unicode.c \
-   misc.c memdbg.c -o ../run/cprepair
+ 

UPDATE: openscad

[Brad Smith]

Here is a diff to fix openscad build with newer Boost.



Index: patches/patch-src_import_cc
===
RCS file: patches/patch-src_import_cc
diff -N patches/patch-src_import_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_import_cc 4 Dec 2020 01:34:56 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix build with newer Boost.
+
+Index: src/import.cc
+--- src/import.cc.orig
 src/import.cc
+@@ -50,7 +50,6 @@ namespace fs = boost::filesystem;
+ #include 
+ using namespace boost::assign; // bring 'operator+=()' into scope
+ 
+-#include 
+ #include 
+ 
+ extern PolySet * import_amf(std::string, const Location );

UPDATE: yaml-cpp 0.6.3

[Brad Smith]

Here is an update to yaml-cpp 0.6.3.

Removes dependency on Boost.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/yaml-cpp/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile15 Aug 2020 20:30:51 -  1.17
+++ Makefile1 Dec 2020 19:22:41 -
@@ -2,14 +2,13 @@
 
 COMMENT =  YAML parser and emitter in C++
 
-V= 0.5.1
+V= 0.6.3
 GH_ACCOUNT=jbeder
 GH_PROJECT=yaml-cpp
-GH_TAGNAME=release-$V
+GH_TAGNAME=yaml-cpp-$V
 DISTNAME = yaml-cpp-$V
-REVISION = 7
 
-SHARED_LIBS =  yaml-cpp2.0 # 0.5
+SHARED_LIBS =  yaml-cpp3.0 # 0.5
 
 CATEGORIES =   devel
 
@@ -20,13 +19,12 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
-COMPILER = base-clang ports-gcc base-gcc
-
-BUILD_DEPENDS =devel/boost
-RUN_DEPENDS =  devel/boost
+COMPILER = base-clang ports-gcc
 
 MODULES =  devel/cmake
 
-CONFIGURE_ARGS =   -DBUILD_SHARED_LIBS=ON
+CONFIGURE_ARGS =   -DYAML_BUILD_SHARED_LIBS=ON \
+   -DYAML_CPP_BUILD_TOOLS=OFF \
+   -DYAML_CPP_BUILD_TESTS=OFF
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/yaml-cpp/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo25 Jun 2015 07:37:00 -  1.4
+++ distinfo1 Dec 2020 18:33:02 -
@@ -1,2 +1,2 @@
-SHA256 (yaml-cpp-0.5.1.tar.gz) = DIjEmInptp5np+1Vk4uz+AY/p4fP02/IEO4B7zQuHnc=
-SIZE (yaml-cpp-0.5.1.tar.gz) = 117086
+SHA256 (yaml-cpp-0.6.3.tar.gz) = d+obkLNxiqDDJCB8spQY9bztI1TC5IOpUj2Yw0YK8e0=
+SIZE (yaml-cpp-0.6.3.tar.gz) = 1398768
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt4 Nov 2014 19:10:41 -   1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2014/11/04 19:10:41 dcoppa Exp $
 CMakeLists.txt.origSun Apr 14 01:37:53 2013
-+++ CMakeLists.txt Tue Nov  4 16:07:08 2014
-@@ -127,8 +127,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   set(CMAKE_BUILD_TYPE Release)
-   endif()
-   #
--  set(CMAKE_CXX_FLAGS_RELEASE "-O2")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-+  set(CMAKE_CXX_FLAGS_RELEASE "")
-+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g")
-   set(CMAKE_CXX_FLAGS_DEBUG "-g")
-   set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
-   #
-@@ -142,11 +142,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   #
-   set(CMAKE_CXX_FLAGS "-Wall ${GCC_EXTRA_OPTIONS} -pedantic 
-Wno-long-long ${CMAKE_CXX_FLAGS}")
-   #
--  add_custom_target(debuggable $(MAKE) clean
-+  add_custom_target(debuggable ${MAKE} clean
-   COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug 
${CMAKE_SOURCE_DIR}
-   COMMENT "Adjusting settings for debug compilation"
-   VERBATIM)
--  add_custom_target(releasable $(MAKE) clean
-+  add_custom_target(releasable ${MAKE} clean
-   COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release 
${CMAKE_SOURCE_DIR}
-   COMMENT "Adjusting settings for release compilation"
-   VERBATIM)
Index: patches/patch-include_yaml-cpp_node_detail_iterator_h
===
RCS file: patches/patch-include_yaml-cpp_node_detail_iterator_h
diff -N patches/patch-include_yaml-cpp_node_detail_iterator_h
--- patches/patch-include_yaml-cpp_node_detail_iterator_h   15 Aug 2020 
20:30:51 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-include_yaml-cpp_node_detail_iterator_h,v 1.1 2020/08/15 
20:30:51 rsadowski Exp $
-
-Index: include/yaml-cpp/node/detail/iterator.h
 include/yaml-cpp/node/detail/iterator.h.orig
-+++ include/yaml-cpp/node/detail/iterator.h
-@@ -44,7 +44,7 @@ namespace YAML
-   private:
-   friend class boost::iterator_core_access;
- 
--  void increment() { this->base_reference() = 
boost::next(this->base()); }
-+  void increment() { this->base_reference() = 
std::next(this->base()); }
-   
-   value_type dereference() const {
-   const typename base_type::value_type& v = 
*this->base();
Index: patches/patch-src_node_data_cpp
===
RCS file: patches/patch-src_node_data_cpp
diff -N patches/patch-src_node_data_cpp
--- patches/patch-src_node_data_cpp 15 Aug 2020 20:30:51 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 

UPDATE: opencolorio

[Brad Smith]

Merge in a diff to fix building with newer yaml-cpp.

Upstream indicates this bit of code was to workaround a symbol collision
issue if linking with an embedded copy of yaml-cpp but does not matter
for an external copy. Builds fine with yaml-cpp as is.



Index: Makefile
===
RCS file: /home/cvs/ports/graphics/opencolorio/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:47:04 -  1.10
+++ Makefile2 Dec 2020 04:52:21 -
@@ -5,7 +5,7 @@ COMMENT =   color management library
 V =20140911
 DISTNAME = OpenColorIO-$V
 PKGNAME =  opencolorio-$V
-REVISION = 2
+REVISION = 3
 
 SHARED_LIBS +=  OpenColorIO   1.0 # 1.0
 
Index: patches/patch-src_core_OCIOYaml_cpp
===
RCS file: patches/patch-src_core_OCIOYaml_cpp
diff -N patches/patch-src_core_OCIOYaml_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_core_OCIOYaml_cpp 2 Dec 2020 04:53:06 -
@@ -0,0 +1,51 @@
+$OpenBSD$
+
+Fix the build with newer yaml-cpp.
+
+Index: src/core/OCIOYaml.cpp
+--- src/core/OCIOYaml.cpp.orig
 src/core/OCIOYaml.cpp
+@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
+ 
+ #include 
+ 
+-#ifndef WINDOWS
+-
+-// fwd declare yaml-cpp visibility
+-#pragma GCC visibility push(hidden)
+-namespace YAML {
+-class Exception;
+-class BadDereference;
+-class RepresentationException;
+-class EmitterException;
+-class ParserException;
+-class InvalidScalar;
+-class KeyNotFound;
+-template  class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-}
+-#pragma GCC visibility pop
+-
+-#endif
+-
+ #include 
+ 
+ #include "Logging.h"

UPDATE: graphics/feh 3.5 => 3.6

[Brian Callahan]

Hi ports --

Attached is a straightforward update to graphics/feh.
The changelog is at https://feh.finalrewind.org/archive/3.6/
Some more eyes (big endian) appreciated.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile	7 Sep 2020 21:04:21 -	1.103
+++ Makefile	3 Dec 2020 22:53:31 -
@@ -2,7 +2,7 @@
 
 COMMENT=	lightweight image viewer
 
-DISTNAME=	feh-3.5
+DISTNAME=	feh-3.6
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	graphics
 FIX_EXTRACT_PERMISSIONS=Yes
Index: distinfo
===
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.65
diff -u -p -r1.65 distinfo
--- distinfo	7 Sep 2020 21:04:21 -	1.65
+++ distinfo	3 Dec 2020 22:53:31 -
@@ -1,2 +1,2 @@
-SHA256 (feh-3.5.tar.bz2) = OI+dzIKEAxAjNkNV4jqCwnbnnKYU8tzWTS+SeFekUx4=
-SIZE (feh-3.5.tar.bz2) = 2115162
+SHA256 (feh-3.6.tar.bz2) = h3ddZqQA5kpsmGYQfBNjVeZ67FfnO54wE30ORr9fz9g=
+SIZE (feh-3.6.tar.bz2) = 2116101
Index: patches/patch-man_feh_pre
===
RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v
retrieving revision 1.49
diff -u -p -r1.49 patch-man_feh_pre
--- patches/patch-man_feh_pre	7 Sep 2020 21:04:21 -	1.49
+++ patches/patch-man_feh_pre	3 Dec 2020 22:53:31 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-man_feh_pre,v 1.49 2020/
 Index: man/feh.pre
 --- man/feh.pre.orig
 +++ man/feh.pre
-@@ -1328,7 +1328,7 @@ which
+@@ -1346,7 +1346,7 @@ which
  defaults to
  .Pa ~/.config/feh/ .
  If the files are not found in that directory, it will also try

Re: gcc --static produces programs that crash

[j]

Hi George,


On 2020-12-02 19:57, George Koehler wrote:

This diff in lang/gcc/8 works for me on amd64 and powerpc.  I would
like tests on more arches.  Is it ok to commit?


I tested this diff on a Raspberry Pi4 (aarch64) and it succeeds with
testing -Bdynamic or -static for Fortran and C, and
checking the -R option for c++.  These tests fail for -static
on a stock 6.8 release.


for linking in "-Bdynamic" "-static" ; do

  echo linking is ${linking}
  egfortran -o fworks fworks.f90 ${linking}
  ./fworks || echo "" Fortran ${linking} fails

  egcc  -o cworks cworks.c   ${linking}
  ./cworks || echo "" CC ${linking} fails

done

eg++ -fPIC -shared cppshare.cpp -o libcppshare.so
eg++ -L . -lcppshare -o cppworks cppworks.cpp
./cppworks && echo " ./cppworks somehow finds local libcppshare.so 
without LD_LIBRARY_PATH!!!"

LD_LIBRARY_PATH=. ./cppworks

eg++ -L . -lcppshare -o cppworks cppworks.cpp -R `pwd`
./cppworks || echo " cant find local libcppshare.so with -R option"


So I believe I have covered most of your diff with these tests, except
the -nostdlib parsing.



John




This diff makes 4 changes to LINK_SPEC:
  1. use "%{!static:-dynamic-linker /usr/libexec/ld.so}" to fix
 static linking; you can try the Fortran example below.
  2. change %{r*:} to %{r:}; base-gcc uses %{r*:}, but upstream
 changed %{r*:} to %{r:} in commit 7aed7df [1].
  3. change -L/usr/lib to %{!nostdlib:-L/usr/lib} to be like base-gcc.
  4. rewrite powerpc's *_rs6000_openbsd_h to be like other arches,
 and add %{!nostdlib:-L/usr/lib} so I can try lld on powerpc.

$ cat works.f90
print *, 'Fortran works.'
end
$ egfortran -o works works.f90 -static
$ ./works
 Fortran works.

%{!shared:%{!nostdlib:%{!r:%{!e*:-e __start
  means if not "gcc -shared" and not "gcc -nostdlib" and not "gcc -r"
  and not "gcc -e something_else", then run "ld -e __start".  We don't
  need this spec on arches like powerpc, where ld's default entry is
  __start, but I added this spec to powerpc to be like other arches.
%{shared:-shared}
  means if "gcc -shared" then "ld -shared".
%{R*}
  means if "gcc -R/some/dir" then "ld -R /some/dir".  This had been
  missing on powerpc, where "gcc -R/some/dir" got ignored.
%{static:-Bstatic}
  means if "gcc -static" then "ld -Bstatic".  We need this to tell ld
  to avoid shared libs when linking static bins.  powerpc was using
  "ld -static", but I changed it to -Bstatic to be like other arches.
%{!static:-Bdynamic}
  might not be needed, but I kept it and added it to powerpc.
%{rdynamic:-export-dynamic}
  was added by our patches, and I kept it.
%{assert*}
  is useless.  The intent is "gcc -assert X" => "ld -assert X", but
  gcc rejects -assert and uses --assert for Fortran.  I didn't delete
  the %{assert*} because upstream hadn't deleted it.
%{!static:-dynamic-linker /usr/libexec/ld.so}
  fixes static linking.  base-gcc uses the longer spec
  %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}
  but there is no such option "gcc -dynamic-linker X"; upstream
  deleted %{!dynamic-linker:} in commit e59dabd [2].
%{!nostdlib:-L/usr/lib}
  is for lld to search /usr/lib.  There is a bug, for which I don't
  know the fix: this spec passes -L/usr/lib too early, so the search
  order is /usr/lib before anything else, and you can't tell gcc to
  use your own libcurses.a instead of the one in /usr/lib [3].

[1] 
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=7aed7dfc45e81230bd4fa01c16b55c0904b49535
[2] 
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e59dabd237f24b87814a3664e2f092c2b107facf

[3] https://marc.info/?l=openbsd-bugs=156547894114050=2

Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile14 Nov 2020 00:00:39 -  1.36
+++ Makefile2 Dec 2020 04:27:15 -
@@ -18,7 +18,7 @@ DPB_PROPERTIES = parallel
 V = 8.4.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
-REVISION = 1
+REVISION = 2

 ADASTRAP-amd64 = adastrap-amd64-8.3.0-2.tar.xz
 ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
Index: patches/patch-gcc_config_aarch64_openbsd_h
===
RCS file: 
/cvs/ports/lang/gcc/8/patches/patch-gcc_config_aarch64_openbsd_h,v

retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_config_aarch64_openbsd_h
--- patches/patch-gcc_config_aarch64_openbsd_h	20 May 2019 14:59:05 
-	1.2
+++ patches/patch-gcc_config_aarch64_openbsd_h	2 Dec 2020 04:27:15 
-

@@ -51,14 +51,14 @@ Index: gcc/config/aarch64/openbsd.h
 +#define SUBTARGET_CPP_SPEC OBSD_CPP_SPEC
 +
 +#define LINK_SPEC \
-+  "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start \
++  "%{!shared:%{!nostdlib:%{!r:%{!e*:-e __start \
 +   %{shared:-shared} %{R*} \
 +   %{static:-Bstatic} \
 +   %{!static:-Bdynamic} \
 +   %{rdynamic:-export-dynamic} \
 +   %{assert*} \
-+   %{!shared:%{!dynamic-linker:-dynamic-linker 

CVS: cvs.openbsd.org: ports

[Andrew Fresh]

CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/12/03 18:19:02

Modified files:
textproc/p5-Text-CSV_XS: Makefile distinfo 

Log message:
Update textproc/p5-Text-CSV_XS to 1.44

[NEW] textproc/p5-Text-Soundex 3.05

[Andrew Hewus Fresh]

This is a port of the Text::Soundex perl module that is needed for an 
update to databases/p5-SQL-Statement.

Comments, OK?


Soundex is a phonetic algorithm for indexing names by sound, as
pronounced in English. The goal is for names with the same pronunciation
to be encoded to the same representation so that they can be matched
despite minor differences in spelling. Soundex is the most widely
known of all phonetic algorithms and is often used (incorrectly)
as a synonym for "phonetic algorithm". Improvements to Soundex are
the basis for many modern phonetic algorithms. (Wikipedia, 2007)

This module implements the original soundex algorithm developed by
Robert Russell and Margaret Odell, patented in 1918 and 1922, as
well as a variation called "American Soundex" used for US census
data, and current maintained by the National Archives and Records
Administration (NARA).

The soundex algorithm may be recognized from Donald Knuth's The Art
of Computer Programming. The algorithm described by Knuth is the
NARA algorithm.


p5-Text-Soundex-3.05.tar.gz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 14:35:56

Modified files:
editors/vim: Makefile distinfo 
editors/vim/patches: patch-runtime_filetype_vim 
 patch-runtime_syntax_bindzone_vim 
editors/vim/pkg: PLIST-main 

Log message:
update to vim-8.2.2083

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 13:58:54

Modified files:
www/tomcat : Makefile.inc 
www/tomcat/v8  : Makefile distinfo 
www/tomcat/v8/pkg: PLIST-examples PLIST-main 
www/tomcat/v9  : Makefile distinfo 
www/tomcat/v9/pkg: PLIST-examples PLIST-main 

Log message:
update to tomcat 8.5.60, 9.0.40

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 13:49:01

Modified files:
lang/lucee : Makefile distinfo 

Log message:
update to lucee 5.3.7.47

Re: UPDATE: x11/fvwm2 to 2.6.7

[Chris Bennett]

Yes, I would like to see fvwm3 get ported.
fvwm configs are extremely confusing. The examples on the various
websites don't work for me, except some pieces.
I setup 20 desktops (if that's the right word for fvwm).
Added a script to open 8 xterms for 2 for each server and 2 for local
use.

FvwmButtons works nice, but I haven't found any icons from fvwm2 useful.
Too old. However, each program like firefox, gimp, gvim has it's own
icon in various sizes. These look nice.

Work on fvwm3 is active and users input is very welcome from upstream.
Quite a few changes in plan have been from users input on the mailing
list.

>From another thread on misc@ or ports@, base fvwm is stuck due to
licensing issues and would require a tremendous effort to port the
pieces in that meet the base requirements. That's OK. It's really just a
quickie method to have X from install.

IMHO, this is a good update.
Perhaps upstream could re-license fvwm2?  Probably not, but would be
nice for us.

Also, could we come up with a nicer default config for base that works
for base and fvwm2 port at the same time? The fonts are too small and
the setup for the windows is very clunky. I have bad eyesight and
1024x768 is long gone (mostly). A very simple FvwmButtons would be cool
too for an example, but not necessary.

I know a lot of people are using fvwm2. I would love to have some configs
contributed and perhaps make an fvwm2-configs port?
I really moved forward when someone submitted their config on the
mailing list a while back.

Anyway, thanks for the work!

Chris Bennett

Re: UPDATE: x11/fvwm2 to 2.6.7

[Michael]

Hello Stuart,

thanks for the feedback.

On Thu, Dec 03, 2020 at 04:24:02PM +, Stuart Henderson wrote:
> > [...]
>
> that would probably be better done as x11/fvwm3

Right, that was my thought as well.


> 
> > I would also like to add pledge() to the most common modules, but I 
> > assume this should better be done with an extra patch and therefore is 
> > not included here.
> 
> btw: pledge can be quite a pain when you're dealing with libraries
> from ports - it can be done if the programs and libraries involved are
> simple, but you can't expect somebody updating a library to figure out
> all the possible interactions with pledge that might occur due to the
> update.

My plan was to focus only on fvwm itself and the most common modules 
like FvwmButtons and FvwmPager. I do not know how sensible touching 
other modules is, especially since maintaining all those patches over 
future updates is probably a some work. Another question then is if 
having a port with only partial pledge() support makes sense at all.


> 
> > Notable changes:
> > * Project moved to github
> > * Updated DESCR
> > * Removed multipackage since the icon package is gone
> ...
> > +@conflict fvwm2-*
> 
> you don't want this ^^
> 
> > +@conflict fvwm95-*
> 
> and this is long dead
> 
> > +@conflict fvwm2+fvicons-*
> > +@conflict fvicons-*
> 
> those two are ok
> 
> you're also missing these
> 
> @pkgpath x11/fvwm2,-main
> @pkgpath x11/fvwm2,-fvicons
> @pkgpath x11/fvwm2,-fvwm2
> 
> and these in quirks $stem_extensions
> 
>   'fvwm2+fvicons' => 'fvwm2',
>   'fvicons' => 'fvwm2',
> 
> to test the update path, fix the above and build packages including a
> new quirks package. move those package files to a directory on their own.
> install the old package/s from a snapshot and point pkg_add at them:
> 
>   PKG_PATH=/tmp/fvwmpkgs pkg_add -D unsigned -ui
> 
> test with the various versions of the old package.
> 
> (the old stuff was a complicated set of alternatives, more akin to
> what FLAVORS would do, they aren't a typical multipackage).
> 

Thanks. I have removed the mentioned @conflict lines and added the 
@pkgpath lines. After adding the above lines to quirks and installing 
it, updating from the respective older fvwm2 packages was successful for 
each one. I assume I do not need to supply a patch for devel/quirks?

Below is the updated patch for x11/fvwm2:


Index: Makefile
===
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- Makefile12 Jul 2019 20:51:11 -  1.67
+++ Makefile3 Dec 2020 19:20:28 -
@@ -1,39 +1,34 @@
 # $OpenBSD: Makefile,v 1.67 2019/07/12 20:51:11 sthen Exp $
 
-COMMENT-main=  multiple virtual desktop window manager, with icons
-COMMENT-fvicons=multiple virtual desktop window manager icons
-COMMENT-fvwm2= multiple virtual desktop window manager, without icons
+COMMENT=   multiple virtual desktop window manager
 
-VERSION=   2.6.5
+VERSION=   2.6.7
 DISTNAME=  fvwm-${VERSION}
-PKGNAME-main=  fvwm2+fvicons-${VERSION}
-FULLPKGNAME-fvicons=fvicons-${VERSION}
-PKGNAME-fvwm2= fvwm2-${VERSION}
-REVISION=  6
+PKGNAME=   fvwm2-${VERSION}
 
 CATEGORIES= x11
 
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
+HOMEPAGE=  https://www.fvwm.org/
 
-HOMEPAGE=  http://www.fvwm.org/
+MAINTAINER=Michael 
 
 # GPL/BSD-like (badly worded)
 PERMIT_PACKAGE=Yes
 
+MASTER_SITES=  https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/
+
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+
 WANTLIB += ICE SM X11 Xcursor Xext Xft Xinerama Xpm Xrender
 WANTLIB += c cairo curses fontconfig freetype gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
 WANTLIB += readline rsvg-2 z
 
-MASTER_SITES=  ftp://ftp.fvwm.org/pub/fvwm/version-2/
-
 LIB_DEPENDS+=  graphics/png \
x11/gnome/librsvg
 
 BUILD_DEPENDS= textproc/libxslt
 
-MULTI_PACKAGES=-main -fvwm2 -fvicons
-
 FLAVORS=   debug
 FLAVOR?=
 
@@ -41,15 +36,10 @@ FLAVOR?=
 CONFIGURE_ARGS+= --enable-debug-msgs
 .endif
 
-PKG_ARCH-fvicons=  *
-LIB_DEPENDS-fvicons=
-WANTLIB-fvicons=
-FULLPKGPATH-fvicons=   ${PKGPATH},-fvicons
-
 SUBST_VARS=VERSION
 
-SEPARATE_BUILD= Yes
-CONFIGURE_STYLE= gnu
+SEPARATE_BUILD=Yes
+CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS +=  --disable-bidi \
--disable-gtk \
--without-gnome \
@@ -57,10 +47,5 @@ CONFIGURE_ARGS +=--disable-bidi \
--without-stroke-library
 CONFIGURE_ENV +=   CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
-   ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm 
${PREFIX}/share/pixmaps/fvwm/
-   ${INSTALL_DATA} 

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2020/12/03 12:29:06

Modified files:
x11/mate/pluma : Makefile distinfo 

Log message:
update to 1.24.1 and unbreak plugins by using GNU libtool

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2020/12/03 11:46:47

Modified files:
www/chromium   : Makefile distinfo 
www/chromium/patches: patch-chrome_app_generated_resources_grd 
  patch-chrome_browser_about_flags_cc 
  
patch-chrome_browser_chrome_browser_interface_binders_cc 
  
patch-chrome_browser_chrome_content_browser_client_cc 
  
patch-chrome_browser_chrome_content_browser_client_h 
  patch-chrome_browser_flag_descriptions_cc 
  patch-chrome_browser_flag_descriptions_h 
  
patch-chrome_browser_plugins_plugin_info_host_impl_cc 
  
patch-chrome_renderer_chrome_content_renderer_client_cc 
  patch-content_public_common_content_features_cc 
  patch-device_bluetooth_BUILD_gn 
  
patch-media_mojo_clients_mojo_video_encode_accelerator_cc 
www/chromium/pkg: PFRAG.component 

Log message:
update to 87.0.4280.88

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 11:21:34

Modified files:
net/libunbound : Makefile distinfo 

Log message:
update to libunbound-1.13.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 11:04:02

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/patches: patch-daily_sh 
  patch-misc_config_definitions_json 
net/librenms/pkg: PLIST 

Log message:
update to librenms-1.70.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 10:10:28

Modified files:
net/unifi/stable: Makefile distinfo 
net/unifi/stable/pkg: PLIST 

Log message:
update to unifi-6.0.41

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/12/03 09:52:26

Modified files:
print/cups-filters: Makefile distinfo 

Log message:
Update to cups-filters-1.28.6.

Re: abiword segfaults immediately

[James Cook]

On Thu, Dec 03, 2020 at 04:48:04PM +, James Cook wrote:
> I just installed abiword and also just upgraded to the latest snapshot
> (and ran pkg_add -u). abiword immediately crashes when I run it. I have
> never tried running abiword on OpenBSD before. Is it broken for others
> or just for me?

Sorry, should probably include uname:

falsifian angel ~ $ uname -a
OpenBSD angel.falsifian.org 6.8 GENERIC.MP#206 amd64

and here's dmesg output in case it's helpful.

OpenBSD 6.8-current (GENERIC.MP) #206: Wed Dec  2 17:47:17 MST 2020
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 17161912320 (16366MB)
avail mem = 16626487296 (15856MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xf0100 (59 entries)
bios0: vendor Award Software International, Inc. version "F7" date 11/20/2009
bios0: Gigabyte Technology Co., Ltd. GA-MA790XT-UD4P
acpi0 at bios0: ACPI 1.0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SSDT HPET MCFG TAMG APIC
acpi0: wakeup devices PCI0(S5) USB0(S3) USB1(S3) USB2(S3) USB3(S3) USB4(S3) 
USB5(S3) USB6(S3) SBAZ(S4) P2P_(S5) PCE2(S4) PCE3(S4) PCE4(S4) PCE5(S4) 
PCE6(S4) PCE7(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpihpet0 at acpi0: 14318180 Hz
acpimcfg0 at acpi0
acpimcfg0: addr 0xe000, bus 0-255
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD Phenom(tm) II X3 710 Processor, 2612.29 MHz, 10-04-02
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,ITSC
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache, 6MB 64b/line 48-way L3 cache
cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu0: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu0: AMD erratum 721 detected and fixed
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 200MHz
cpu0: mwait min=64, max=64, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: AMD Phenom(tm) II X3 710 Processor, 2611.92 MHz, 10-04-02
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,ITSC
cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache, 6MB 64b/line 48-way L3 cache
cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu1: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu1: AMD erratum 721 detected and fixed
cpu1: smt 0, core 1, package 0
cpu2 at mainbus0: apid 2 (application processor)
cpu2: AMD Phenom(tm) II X3 710 Processor, 2611.93 MHz, 10-04-02
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,ITSC
cpu2: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache, 6MB 64b/line 48-way L3 cache
cpu2: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu2: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu2: AMD erratum 721 detected and fixed
cpu2: smt 0, core 2, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec0, version 21, 24 pins, remapped
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 4 (P2P_)
acpiprt2 at acpi0: bus 1 (PCE2)
acpiprt3 at acpi0: bus -1 (PCE3)
acpiprt4 at acpi0: bus 2 (PCE4)
acpiprt5 at acpi0: bus -1 (PCE5)
acpiprt6 at acpi0: bus -1 (PCE6)
acpiprt7 at acpi0: bus -1 (PCE7)
acpiprt8 at acpi0: bus -1 (PCE8)
acpiprt9 at acpi0: bus -1 (PCE9)
acpiprt10 at acpi0: bus 3 (PCEA)
acpiprt11 at acpi0: bus -1 (PCEB)
acpiprt12 at acpi0: bus -1 (PCEC)
acpibtn0 at acpi0: PWRB
acpipci0 at acpi0 PCI0
acpicmos0 at acpi0
"PNP0C14" at acpi0 not configured
acpicpu0 at acpi0: C1(@1 halt!), PSS
acpicpu1 at acpi0: C1(@1 halt!), PSS
acpicpu2 at acpi0: C1(@1 halt!), PSS
cpu0: 2612 MHz: speeds: 2600 1900 1400 800 MHz
pci0 at mainbus0 bus 0
0:0:0: mem address conflict 0xe000/0x2000
pchb0 at pci0 dev 0 function 0 "ATI RD780 HT-PCIE" rev 0x00
ppb0 at pci0 dev 2 function 0 "ATI RD790 PCIE" rev 0x00
pci1 at ppb0 bus 1
radeondrm0 at pci1 dev 0 function 0 "ATI Radeon HD 5450" rev 0x00
drm0 at radeondrm0
radeondrm0: msi
azalia0 at pci1 dev 0 function 1 "ATI Radeon HD 5470 Audio" rev 0x00: msi
azalia0: no supported codecs
ppb1 at pci0 dev 4 function 0 "ATI RD790 PCIE" rev 0x00
pci2 at ppb1 bus 2
jmb0 at pci2 dev 0 function 0 "JMicron JMB363 

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/12/03 09:51:56

Modified files:
archivers/libarchive: Makefile distinfo 

Log message:
maintenance update to 3.5.0

abiword segfaults immediately

[James Cook]

I just installed abiword and also just upgraded to the latest snapshot
(and ran pkg_add -u). abiword immediately crashes when I run it. I have
never tried running abiword on OpenBSD before. Is it broken for others
or just for me?

falsifian angel ~ $ abiword
Abort trap (core dumped) 
falsifian angel ~ $ egdb abiword
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.8".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.
For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from abiword...(no debugging symbols found)...done.
(gdb) run
Starting program: /usr/local/bin/abiword 

Program received signal SIGSEGV, Segmentation fault.
0x072405ab041a in EV_UnixMenu::synthesizeMenu(_GtkWidget*, bool) ()
   from /usr/local/lib/libabiword-3.0.so
(gdb) bt
#0  0x072405ab041a in EV_UnixMenu::synthesizeMenu(_GtkWidget*, bool) ()
   from /usr/local/lib/libabiword-3.0.so
#1  0x072405ab23c5 in EV_UnixMenuBar::synthesizeMenuBar() ()
   from /usr/local/lib/libabiword-3.0.so
#2  0x072405a3f368 in XAP_UnixFrameImpl::_createTopLevelWindow() ()
   from /usr/local/lib/libabiword-3.0.so
#3  0x0724058e2476 in AP_UnixFrameImpl::_createWindow() ()
   from /usr/local/lib/libabiword-3.0.so
#4  0x0724058e074a in AP_UnixFrame::initialize(_FrameModes) ()
   from /usr/local/lib/libabiword-3.0.so
#5  0x07240589cbcf in AP_UnixApp::newFrame() ()
   from /usr/local/lib/libabiword-3.0.so
#6  0x0724058fdcfa in AP_App::openCmdLineFiles(AP_Args const*) ()
   from /usr/local/lib/libabiword-3.0.so
#7  0x07240589e319 in AP_UnixApp::main(char const*, int, char**) ()
   from /usr/local/lib/libabiword-3.0.so
#8  0x07218c6f2e61 in ?? ()
#9  0x in ?? ()
(gdb) 

-- 
James

Re: UPDATE: x11/fvwm2 to 2.6.7

[Stuart Henderson]

On 2020/12/03 15:45, Michael wrote:
> Hello ports,
> 
> first of all I initially overlooked that there was already an attempt to 
> bring fvwm to 2.6.9 [0] in April. The 2.6.7 port update was done 
> independent of that and since 2.6.7 is still marked as the "stable" 
> version [1] I would prefer that version for now. There is also another, 
> older version labeled as LTS, however as I understand it this only keeps 
> some ancient modules alive. Should those really be needed there is 
> always the version from base. Furthermore there is already fvwm3 [2] but 
> since it is not marked as stable (I think) and also will break 
> compatibility with fvwm2 config files some day, I suggest treating this 
> as a different subject.

that would probably be better done as x11/fvwm3

> I would also like to add pledge() to the most common modules, but I 
> assume this should better be done with an extra patch and therefore is 
> not included here.

btw: pledge can be quite a pain when you're dealing with libraries
from ports - it can be done if the programs and libraries involved are
simple, but you can't expect somebody updating a library to figure out
all the possible interactions with pledge that might occur due to the
update.

> Notable changes:
> * Project moved to github
> * Updated DESCR
> * Removed multipackage since the icon package is gone
...
> +@conflict fvwm2-*

you don't want this ^^

> +@conflict fvwm95-*

and this is long dead

> +@conflict fvwm2+fvicons-*
> +@conflict fvicons-*

those two are ok

you're also missing these

@pkgpath x11/fvwm2,-main
@pkgpath x11/fvwm2,-fvicons
@pkgpath x11/fvwm2,-fvwm2

and these in quirks $stem_extensions

'fvwm2+fvicons' => 'fvwm2',
'fvicons' => 'fvwm2',

to test the update path, fix the above and build packages including a
new quirks package. move those package files to a directory on their own.
install the old package/s from a snapshot and point pkg_add at them:

PKG_PATH=/tmp/fvwmpkgs pkg_add -D unsigned -ui

test with the various versions of the old package.

(the old stuff was a complicated set of alternatives, more akin to
what FLAVORS would do, they aren't a typical multipackage).

CVS: cvs.openbsd.org: ports

[Anton Lindqvist]

CVSROOT:/cvs
Module name:ports
Changes by: an...@cvs.openbsd.org   2020/12/03 09:05:22

Modified files:
mail/mdsort: Makefile distinfo 

Log message:
update to mdsort-7.1.0

- add support for matching each attachment in a message, Its intended
use is to extract calendar attachments
- fix label concatenation bug

[UPDATE] emulators/mgba to 0.8.4

[Ricardo Mestre]

Hi,

This updates mgba to 0.8.4, tested on amd64.

Comments? OK?

/mestre

Emulation fixes

- GB Audio: Fix initial sweep state
- GB Audio: Fix deserializing audio channels 2 and 3
- GB Audio: Fix deserializing while audio was disabled (fixes #1305)
- GB Video: Fix drawing background when window is force-disabled by frontend
- GB, GBA Video: Copy disable flags when drawing scanlines in proxy when not
blocking
- GBA Audio: Fix deserializing SOUNDCNT_L
- GBA Audio: Fix stereo in XQ audio
- GBA Audio: Fix volume/mute in XQ audio (fixes #1864)
- GBA Hardware: Fix GB Player detection on big endian platforms
- GBA Video: Invalidate map cache when modifying BGCNT (fixes #1846)
- GBA Video: Don’t draw sprites using unmapped VRAM in GL renderer (fixes
#1865)
- GBA Video: Fix rare regression blending semitransparent sprites (fixes #1876)
- GBA Video: Do not affect OBJ pixel priority when writing OBJWIN (fixes #1890)
- GBA Video: Fix deferred blending when OBJWIN matches window (fixes #1905)
- GBA Video: Fix mode 4 transparency in OpenGL (fixes #1907)

Other fixes:

- 3DS: Redo video sync to be more precise
- 3DS: Fix crash with libctru 2.0 when exiting
- ARM Decoder: Fix decoding pre-indexed writeback instructions (fixes #1915)
- Core: Fix reported ROM size when a fixed buffer size is used
- Core: Fix memory leak loading ELF files
- GBA: Disable more checks when loading GS save with checks disabled (fixes
#1851)
- GBA: Fix endianness issues in renderer proxy
- GBA Core: Fix memory leak when loading symbols
- GBA Serialize: Ensure program counter is aligned when loading
- Qt: Add dummy English translation file (fixes #1469)
- Qt: Fix Battle Chip view not displaying chips on some DPI settings
- Qt: Fix camera image being upside-down sometimes (fixes #829 again)
- Qt: Fix drawing on macOS break when using OpenGL (fixes #1899)
- Qt: Fix stride changing when toggling SGB borders (fixes #1898)
- Qt: Fix aliasing on background logo (fixes #1886)
- mGUI: Fix closing down a game if an exit is signalled
- mGUI: Fix cycling through config setting states with accept button
- mVL: Fix injecting accidentally draining non-injection buffer
- VFS: Fix directory node listing on some filesystems

Misc:

- GBA Video: Improve speed of window texture generation on AMD
- Vita: Clear both buffers when loading a game

Index: Makefile
===
RCS file: /cvs/ports/emulators/mgba/Makefile,v
retrieving revision 1.42
diff -u -p -u -r1.42 Makefile
--- Makefile24 Sep 2020 07:31:51 -  1.42
+++ Makefile3 Dec 2020 15:52:34 -
@@ -4,7 +4,7 @@ COMMENT-main =  Game Boy Color/Advance e
 COMMENT-qt =   Game Boy Color/Advance emulator with GUI
 COMMENT-libretro = Game Boy Color/Advance core for retroarch
 
-V =0.8.3
+V =0.8.4
 GH_ACCOUNT =   mgba-emu
 GH_PROJECT =   mgba
 GH_TAGNAME =   $V
Index: distinfo
===
RCS file: /cvs/ports/emulators/mgba/distinfo,v
retrieving revision 1.17
diff -u -p -u -r1.17 distinfo
--- distinfo24 Sep 2020 07:31:51 -  1.17
+++ distinfo3 Dec 2020 15:52:34 -
@@ -1,2 +1,2 @@
-SHA256 (mgba-0.8.3.tar.gz) = YwRdCBXhXpY9kLFdWhDt8xpdctDdteAo5Cujiw1DaMk=
-SIZE (mgba-0.8.3.tar.gz) = 12013512
+SHA256 (mgba-0.8.4.tar.gz) = a5SHPayQQP1v2fE/dtxI80LpVPO0z4Jxe1lgHDoytyw=
+SIZE (mgba-0.8.4.tar.gz) = 12347906

UPDATE: x11/fvwm2 to 2.6.7

[Michael]

Hello ports,

first of all I initially overlooked that there was already an attempt to 
bring fvwm to 2.6.9 [0] in April. The 2.6.7 port update was done 
independent of that and since 2.6.7 is still marked as the "stable" 
version [1] I would prefer that version for now. There is also another, 
older version labeled as LTS, however as I understand it this only keeps 
some ancient modules alive. Should those really be needed there is 
always the version from base. Furthermore there is already fvwm3 [2] but 
since it is not marked as stable (I think) and also will break 
compatibility with fvwm2 config files some day, I suggest treating this 
as a different subject.

I would also like to add pledge() to the most common modules, but I 
assume this should better be done with an extra patch and therefore is 
not included here.

Notable changes:
* Project moved to github
* Updated DESCR
* Removed multipackage since the icon package is gone
* This fvwm version ships with a new default config
* Take maintainer role

Tested on amd64.


[0] https://marc.info/?l=openbsd-ports=158649961609923=2
[1] https://github.com/fvwmorg/fvwm
[2] https://github.com/fvwmorg/fvwm3


Index: Makefile
===
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- Makefile12 Jul 2019 20:51:11 -  1.67
+++ Makefile3 Dec 2020 14:16:09 -
@@ -1,39 +1,34 @@
 # $OpenBSD: Makefile,v 1.67 2019/07/12 20:51:11 sthen Exp $
 
-COMMENT-main=  multiple virtual desktop window manager, with icons
-COMMENT-fvicons=multiple virtual desktop window manager icons
-COMMENT-fvwm2= multiple virtual desktop window manager, without icons
+COMMENT=   multiple virtual desktop window manager
 
-VERSION=   2.6.5
+VERSION=   2.6.7
 DISTNAME=  fvwm-${VERSION}
-PKGNAME-main=  fvwm2+fvicons-${VERSION}
-FULLPKGNAME-fvicons=fvicons-${VERSION}
-PKGNAME-fvwm2= fvwm2-${VERSION}
-REVISION=  6
+PKGNAME=   fvwm2-${VERSION}
 
 CATEGORIES= x11
 
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
+HOMEPAGE=  https://www.fvwm.org/
 
-HOMEPAGE=  http://www.fvwm.org/
+MAINTAINER=Michael 
 
 # GPL/BSD-like (badly worded)
 PERMIT_PACKAGE=Yes
 
+MASTER_SITES=  https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/
+
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+
 WANTLIB += ICE SM X11 Xcursor Xext Xft Xinerama Xpm Xrender
 WANTLIB += c cairo curses fontconfig freetype gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
 WANTLIB += readline rsvg-2 z
 
-MASTER_SITES=  ftp://ftp.fvwm.org/pub/fvwm/version-2/
-
 LIB_DEPENDS+=  graphics/png \
x11/gnome/librsvg
 
 BUILD_DEPENDS= textproc/libxslt
 
-MULTI_PACKAGES=-main -fvwm2 -fvicons
-
 FLAVORS=   debug
 FLAVOR?=
 
@@ -41,15 +36,10 @@ FLAVOR?=
 CONFIGURE_ARGS+= --enable-debug-msgs
 .endif
 
-PKG_ARCH-fvicons=  *
-LIB_DEPENDS-fvicons=
-WANTLIB-fvicons=
-FULLPKGPATH-fvicons=   ${PKGPATH},-fvicons
-
 SUBST_VARS=VERSION
 
-SEPARATE_BUILD= Yes
-CONFIGURE_STYLE= gnu
+SEPARATE_BUILD=Yes
+CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS +=  --disable-bidi \
--disable-gtk \
--without-gnome \
@@ -57,10 +47,5 @@ CONFIGURE_ARGS +=--disable-bidi \
--without-stroke-library
 CONFIGURE_ENV +=   CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
-   ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm 
${PREFIX}/share/pixmaps/fvwm/
-   ${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc 
${PREFIX}/share/fvwm
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/fvwm2/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo18 Jan 2015 03:15:53 -  1.14
+++ distinfo3 Dec 2020 14:16:09 -
@@ -1,4 +1,2 @@
-SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
-SHA256 (fvwm_icons-20070101.tar.gz) = 
oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
-SIZE (fvwm-2.6.5.tar.gz) = 3449177
-SIZE (fvwm_icons-20070101.tar.gz) = 363286
+SHA256 (fvwm-2.6.7.tar.gz) = AWVNWr3N5trBMcrpvv5c9vAfn3Uk0JfDsPMW45+E73M=
+SIZE (fvwm-2.6.7.tar.gz) = 3934327
Index: patches/patch-bin_Makefile_in
===
RCS file: /cvs/ports/x11/fvwm2/patches/patch-bin_Makefile_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-bin_Makefile_in
--- patches/patch-bin_Makefile_in   26 Apr 2011 18:50:46 -  1.1
+++ patches/patch-bin_Makefile_in   3 Dec 2020 14:16:09 -
@@ -1,12 +1,14 @@
-$OpenBSD: patch-bin_Makefile_in,v 1.1 2011/04/26 18:50:46 shadchin Exp $
 bin/Makefile.in.orig   Fri Mar  4 08:47:50 2011
-+++ 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 08:23:27

Modified files:
net/icinga/core2: Tag: OPENBSD_6_8 Makefile distinfo 
net/icinga/core2/pkg: Tag: OPENBSD_6_8 PLIST-main 

Log message:
update -stable icinga2 to 2.12.2 and switch to openssl

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 08:22:40

Modified files:
net/icinga/core2: Makefile distinfo 
net/icinga/core2/pkg: PLIST-main 

Log message:
update to icinga2-2.12.2

- switch from libressl to openssl/1.1, the new cert validator doesn't work
with icinga's pki

- add no_mysql/no_pgsql pseudo-flavours to knock out ido from build, making
it easier to do test builds on endpoints

Re: [update] intellij and pycharm to 2020.3

[Lucas Raab]

On Thu, Dec 03, 2020 at 08:04:00AM +0100, Rafael Sadowski wrote:
> On Wed Dec 02, 2020 at 08:05:11PM -0600, Lucas Raab wrote:
> > Hello,
> > 
> > Apologies for the rapid version turnover :/ I would have just waited
> > for 2020.3 had I known they'd be right around the corner from 2020.2.4.
> > 
> > The PLISTs have a lot of churn for this version bump, but they've built
> > and run just fine. Tested by building some projects and running tests
> > within the applications.
> > 
> > New in these releases are "light" versions of the respective
> > applications which are more basic code editors. I personally won't use
> > them, but they're there so let's make them available for use.
> > 
> > intellij release notes: 
> > https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+2020.3+(203.5981.155+build)+Release+Notes
> > intellij What's new: https://www.jetbrains.com/idea/whatsnew/
> > pycharm release notes: 
> > https://confluence.jetbrains.com/display/PYH/PyCharm+2020.3+Release+Notes
> > pycharm What's new: https://www.jetbrains.com/pycharm/whatsnew/
> > 
> > Lucas
> 
> ===>  Faking installation for pycharm-2020.3
> /usr/ports/pobj/pycharm-2020.3/bin/install -d -m 755 
> /usr/ports/pobj/pycharm-2020.3/fake-amd64/usr/local/pycharm
> can't open /usr/ports/devel/pycharm/files/pycharm-lightedit: No such file or 
> directory at /usr/libdata/perl5/OpenBSD/Subst.pm line 90.
> 
> 
> 
> ===>  Faking installation for intellij-2020.3
> /usr/ports/pobj/intellij-2020.3/bin/install -d -m 755 
> /usr/ports/pobj/intellij-2020.3/fake-amd64/usr/local/intellij
> cd /usr/ports/pobj/intellij-2020.3/idea-IC-203.5981.155 && pax -rw . 
> /usr/ports/pobj/intellij-2020.3/fake-amd64/usr/local/intellij
> can't open /usr/ports/devel/intellij/files/idea-lightedit: No such file or 
> directory at /usr/libdata/perl5/OpenBSD/Subst.pm line 90.
> 
Ugh, forgot to include the actual files themselves in the diff

Updated diff attached with some additional feedback from sthen@ around
how the port is extracted and moved into PREFIX

Also, added .desktop files (I promise) for the light modes
diff 4e76066bb6c5d1303cebf6b078a76c5e667980ce /usr/ports
blob - a502a51e1fc81370f28cf6165d1477a770327c1d
file + devel/intellij/Makefile
--- devel/intellij/Makefile
+++ devel/intellij/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   IntelliJ IDEA Java IDE
 
-V= 2020.2.4
+V= 2020.3
 DISTNAME=  ideaIC-${V}
 PKGNAME=   intellij-${V}
 CATEGORIES=devel
@@ -25,27 +25,32 @@ RUN_DEPENDS=devel/desktop-file-utils \
 
 NO_TEST=   Yes
 
-WRKDIST=   ${WRKDIR}/idea-IC-202.8194.7
 IJ=${PREFIX}/intellij
 
+EXTRACT_ONLY=
+
 # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
 # a no-op for do-build.
 do-build:
@true
 
 do-install:
-   ${INSTALL_DATA_DIR} ${IJ}
-   cd ${WRKDIST} && pax -rw . ${IJ}
+   tar xzf ${DISTDIR}/${DISTFILES} -C ${PREFIX}
+   mv ${PREFIX}/idea-IC-* ${IJ}
@rm -rf ${IJ}/bin/libdbm64.so
@rm -rf ${IJ}/jbr
@rm -rf ${IJ}/plugins/android
@${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea
+   @${SUBST_PROGRAM} ${FILESDIR}/idea-lightedit \
+   ${PREFIX}/bin/idea-lightedit
@ln -s ${TRUEPREFIX}/bin/idea ${PREFIX}/bin/intellij
+   @ln -s ${TRUEPREFIX}/bin/idea-lightedit \
+   ${PREFIX}/bin/intellij-lightedit
${INSTALL_MAN} ${FILESDIR}/idea.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-   cd ${WRKDIST}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
-   ${INSTALL_DATA} ${WRKDIST}/lib/icon.png ${IJ}/idea.png
@${SUBST_DATA} ${FILESDIR}/intellij.desktop \
${PREFIX}/share/applications/intellij.desktop
+   @${SUBST_DATA} ${FILESDIR}/intellij-lightedit.desktop \
+   ${PREFIX}/share/applications/intellij-lightedit.desktop
 
 .include 
blob - 9d20300312baa4bf97f04d087681532729306ca7
file + devel/intellij/distinfo
--- devel/intellij/distinfo
+++ devel/intellij/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2020.2.4.tar.gz) = y3+vKwHIdZR8zJDPJDSXMoEBxjwHkUZ2NyQyg1UAnOY=
-SIZE (ideaIC-2020.2.4.tar.gz) = 679072530
+SHA256 (ideaIC-2020.3.tar.gz) = xveLcs97gmGWhWUa6FF8P6+YPcVYxNT0wXGAGrjUNnQ=
+SIZE (ideaIC-2020.3.tar.gz) = 738387806
blob - /dev/null
file + devel/intellij/files/idea-lightedit
--- devel/intellij/files/idea-lightedit
+++ devel/intellij/files/idea-lightedit
@@ -0,0 +1,26 @@
+#!/bin/sh
+# OpenBSD-specific startup script for IntelliJ IDE
+
+IDEA_HOME=${TRUEPREFIX}/intellij
+
+#-
+# Determine configuration settings
+#-
+
+export JAVA_BIN=$(javaPathHelper -c intellij)
+export JAVA_HOME=$(javaPathHelper -h intellij)
+
+if [ ! -x "${JAVA_BIN}" ]; then
+   echo "Error: JAVA_HOME may not be defined 

[Update] devel/avr/gcc: 5.4.0 -> 8.4.0

[Manuel Giraud]

Hi,

Here is an update of avr/gcc. I was able to build current qmk_firmware
(https://qmk.fm/) for my keyboard (with 5.4.0, it was not building since
august 2019).

Index: Makefile
===
RCS file: /cvs/ports/devel/avr/gcc/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile20 Mar 2020 16:44:22 -  1.35
+++ Makefile3 Dec 2020 13:31:46 -
@@ -2,8 +2,8 @@
 
 COMMENT=   Atmel AVR 8-bit RISC microcontrollers' XGCC #'
 
-V= 5.4.0
-REVISION=  3
+V= 8.4.0
+REVISION=  0
 DISTNAME = gcc-$V
 PKGNAME=   avr-gcc-${V}
 SHARED_LIBS +=  cc1plugin 0.0 # 0.0
@@ -17,7 +17,7 @@ WANTLIB=  c gmp mpfr ${COMPILER_LIBCXX} 
 COMPILER = base-clang ports-gcc base-gcc
 
 MASTER_SITES=  ${MASTER_SITE_GCC:=releases/gcc-$(V)/}
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 DIST_SUBDIR=   gcc
 
 BUILD_DEPENDS+=devel/autoconf/2.13 \
Index: distinfo
===
RCS file: /cvs/ports/devel/avr/gcc/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo7 Sep 2018 20:11:08 -   1.7
+++ distinfo3 Dec 2020 13:31:46 -
@@ -1,2 +1,2 @@
-SHA256 (gcc/gcc-5.4.0.tar.bz2) = YI33bewtNN5lWCSdivTL7iHs7dvLWA1mb3paWDyjMDo=
-SIZE (gcc/gcc-5.4.0.tar.bz2) = 95661481
+SHA256 (gcc/gcc-8.4.0.tar.xz) = 4wpuUtEOHyftVRBK0jPDC9HpnPtf+YqwItyUHt0bLdQ=
+SIZE (gcc/gcc-8.4.0.tar.xz) = 63713440
Index: patches/patch-contrib_texi2pod_pl
===
RCS file: patches/patch-contrib_texi2pod_pl
diff -N patches/patch-contrib_texi2pod_pl
--- patches/patch-contrib_texi2pod_pl   16 Apr 2019 15:35:30 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-contrib_texi2pod_pl,v 1.1 2019/04/16 15:35:30 naddy Exp $
-
-Index: contrib/texi2pod.pl
 contrib/texi2pod.pl.orig
-+++ contrib/texi2pod.pl
-@@ -316,7 +316,7 @@ while(<$inf>) {
-   @columns = ();
-   for $column (split (/\s*\@tab\s*/, $1)) {
-   # @strong{...} is used a @headitem work-alike
--  $column =~ s/^\@strong{(.*)}$/$1/;
-+  $column =~ s/^\@strong\{(.*)\}$/$1/;
-   push @columns, $column;
-   }
-   $_ = "\n=item ".join (" : ", @columns)."\n";
Index: patches/patch-gcc_auto-profile_c
===
RCS file: patches/patch-gcc_auto-profile_c
diff -N patches/patch-gcc_auto-profile_c
--- patches/patch-gcc_auto-profile_c13 Sep 2018 11:13:00 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-gcc_auto-profile_c,v 1.1 2018/09/13 11:13:00 jasper Exp $
-
-fix build with libc++
-https://svnweb.freebsd.org/ports/head/devel/avr-gcc/files/patch-libc%2B%2B?revision=435893=markup
-
-Index: gcc/auto-profile.c
 gcc/auto-profile.c.orig
-+++ gcc/auto-profile.c
-@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3.  If not see
- .  */
- 
- #include "config.h"
--#include "system.h"
--
--#include 
- #include 
- #include 
-+#include "system.h"
- 
- #include "coretypes.h"
- #include "hash-set.h"
Index: patches/patch-gcc_graphite-isl-ast-to-gimple_c
===
RCS file: patches/patch-gcc_graphite-isl-ast-to-gimple_c
diff -N patches/patch-gcc_graphite-isl-ast-to-gimple_c
--- patches/patch-gcc_graphite-isl-ast-to-gimple_c  13 Sep 2018 11:13:00 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-gcc_graphite-isl-ast-to-gimple_c,v 1.1 2018/09/13 11:13:00 
jasper Exp $
-
-fix build with libc++
-https://svnweb.freebsd.org/ports/head/devel/avr-gcc/files/patch-libc%2B%2B?revision=435893=markup
-
-Index: gcc/graphite-isl-ast-to-gimple.c
 gcc/graphite-isl-ast-to-gimple.c.orig
-+++ gcc/graphite-isl-ast-to-gimple.c
-@@ -38,6 +38,7 @@ extern "C" {
- #endif
- #endif
- 
-+#include 
- #include "system.h"
- #include "coretypes.h"
- #include "hash-set.h"
-@@ -75,7 +76,6 @@ extern "C" {
- #include "tree-scalar-evolution.h"
- #include "gimple-ssa.h"
- #include "tree-into-ssa.h"
--#include 
- 
- #ifdef HAVE_isl
- #include "graphite-poly.h"
Index: patches/patch-gcc_system_h
===
RCS file: patches/patch-gcc_system_h
diff -N patches/patch-gcc_system_h
--- patches/patch-gcc_system_h  13 Sep 2018 11:13:00 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-gcc_system_h,v 1.1 2018/09/13 11:13:00 jasper Exp $
-
-fix build with libc++
-https://svnweb.freebsd.org/ports/head/devel/avr-gcc/files/patch-libc%2B%2B?revision=435893=markup
-
-Index: gcc/system.h
 gcc/system.h.orig
-+++ gcc/system.h
-@@ -217,6 +217,7 @@ extern int errno;
- #ifdef __cplusplus
- # include 
- # include 
-+# include 
- # include 
- #endif

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/12/03 06:25:07

Modified files:
sysutils/terraform: Makefile distinfo 

Log message:
Update to terraform-0.14.0.

NEW security/stegcracker

[Sebastian Reitenbach]

Hi,

attached tarball for stegcracker:

Information for inst:stegcracker-2.0.9

Comment:
brute-force steganography

Description:
Steganography brute-force utility to uncover hidden data inside files.

Maintainer: Sebastian Reitenbach 

WWW: https://github.com/Paradoxis/StegCracker


comments, tests, feedback, or even OK for import welcome.

cheers,
Sebastian


stegcracker.tar.gz
Description: application/gzip

Re: [UPDATE] math/hdf5 1.12.0

[Martin Reindl]

On Thu, Dec 03, 2020 at 12:54:33PM +, Stuart Henderson wrote:
> On 2020/12/01 21:01, Martin Reindl wrote:
> > The attached diff updates math/hdf5 to the latest version 1.12.0.
> > 
> > - enable fortran
> > - API changes require major bump to all shlib
> > - use configure argument for example dir instead of post-install mv(1)
> > - pull patches from upstream to respect DESTDIR for examples
> >   
> > (https://github.com/HDFGroup/hdf5/commit/4cebd8aa6c965fe2e5dde6dbff36b2be3ca58bf1)
> > - patch h5repack_plugin.sh test to work with our cp(1)
> > 
> > The extensive hdf5 test-suite passes on amd64. My arm64 is too slow so it 
> > runs into
> > the test timeout. Checking currently if raising HDF5_ALARM_SECONDS helps.
> > Also tested on sparc64, but fheap tests fail there.
> > 
> > Also compile and partially run-time tested where especially relevant to me:
> > math/armadillo
> 
> This breaks for me:

Sorry, I had an update to the latest armadillo LTS release in my tree:

Index: Makefile
===
RCS file: /cvs/ports/math/armadillo/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile28 Oct 2019 15:13:35 -  1.5
+++ Makefile3 Dec 2020 13:16:54 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.5 2019/10/28 15:13:35 espie Exp $
 
 COMMENT =  C++ library for scientific computing
-DISTNAME = armadillo-9.800.1
-SHARED_LIBS =  armadillo 3.0   # 9.100
+DISTNAME = armadillo-9.900.4
+SHARED_LIBS =  armadillo 3.1   # 9.900.4
 CATEGORIES =   math
 HOMEPAGE = http://arma.sourceforge.net/
 MAINTAINER =   Marc Espie 
Index: distinfo
===
RCS file: /cvs/ports/math/armadillo/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo28 Oct 2019 15:13:35 -  1.4
+++ distinfo3 Dec 2020 13:16:54 -
@@ -1,2 +1,2 @@
-SHA256 (armadillo-9.800.1.tar.xz) = 
689X4DFGWEjSEQ0tnwsJo7/THX4RcyfmFCk18ueD2u4=
-SIZE (armadillo-9.800.1.tar.xz) = 4713172
+SHA256 (armadillo-9.900.4.tar.xz) = 
cc3naNZ6U/q4mwcGgCG21L8vogINNRw7RJL+Lriz3J0=
+SIZE (armadillo-9.900.4.tar.xz) = 5026688
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/armadillo/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   28 Oct 2019 15:13:35 -  1.4
+++ pkg/PLIST   3 Dec 2020 13:16:54 -
@@ -83,6 +83,7 @@ include/armadillo_bits/cond_rel_meat.hpp
 include/armadillo_bits/config.hpp
 include/armadillo_bits/constants.hpp
 include/armadillo_bits/constants_old.hpp
+include/armadillo_bits/csv_name.hpp
 include/armadillo_bits/debug.hpp
 include/armadillo_bits/def_arpack.hpp
 include/armadillo_bits/def_atlas.hpp
@@ -162,6 +163,7 @@ include/armadillo_bits/fn_join.hpp
 include/armadillo_bits/fn_kmeans.hpp
 include/armadillo_bits/fn_kron.hpp
 include/armadillo_bits/fn_log_det.hpp
+include/armadillo_bits/fn_log_normpdf.hpp
 include/armadillo_bits/fn_logmat.hpp
 include/armadillo_bits/fn_lu.hpp
 include/armadillo_bits/fn_max.hpp
@@ -182,9 +184,11 @@ include/armadillo_bits/fn_orth_null.hpp
 include/armadillo_bits/fn_pinv.hpp
 include/armadillo_bits/fn_polyfit.hpp
 include/armadillo_bits/fn_polyval.hpp
+include/armadillo_bits/fn_powmat.hpp
 include/armadillo_bits/fn_princomp.hpp
 include/armadillo_bits/fn_prod.hpp
 include/armadillo_bits/fn_qr.hpp
+include/armadillo_bits/fn_quantile.hpp
 include/armadillo_bits/fn_qz.hpp
 include/armadillo_bits/fn_randg.hpp
 include/armadillo_bits/fn_randi.hpp
@@ -226,6 +230,7 @@ include/armadillo_bits/fn_trans.hpp
 include/armadillo_bits/fn_trapz.hpp
 include/armadillo_bits/fn_trig.hpp
 include/armadillo_bits/fn_trimat.hpp
+include/armadillo_bits/fn_trimat_ind.hpp
 include/armadillo_bits/fn_trunc_exp.hpp
 include/armadillo_bits/fn_trunc_log.hpp
 include/armadillo_bits/fn_unique.hpp
@@ -269,6 +274,8 @@ include/armadillo_bits/glue_polyfit_bone
 include/armadillo_bits/glue_polyfit_meat.hpp
 include/armadillo_bits/glue_polyval_bones.hpp
 include/armadillo_bits/glue_polyval_meat.hpp
+include/armadillo_bits/glue_quantile_bones.hpp
+include/armadillo_bits/glue_quantile_meat.hpp
 include/armadillo_bits/glue_relational_bones.hpp
 include/armadillo_bits/glue_relational_meat.hpp
 include/armadillo_bits/glue_solve_bones.hpp
@@ -286,6 +293,7 @@ include/armadillo_bits/gmm_full_meat.hpp
 include/armadillo_bits/gmm_misc_bones.hpp
 include/armadillo_bits/gmm_misc_meat.hpp
 include/armadillo_bits/hdf5_misc.hpp
+include/armadillo_bits/hdf5_name.hpp
 include/armadillo_bits/include_atlas.hpp
 include/armadillo_bits/include_hdf5.hpp
 include/armadillo_bits/include_superlu.hpp
@@ -403,6 +411,8 @@ include/armadillo_bits/op_orth_null_bone
 include/armadillo_bits/op_orth_null_meat.hpp
 include/armadillo_bits/op_pinv_bones.hpp
 include/armadillo_bits/op_pinv_meat.hpp
+include/armadillo_bits/op_powmat_bones.hpp
+include/armadillo_bits/op_powmat_meat.hpp
 

Re: [UPDATE] math/hdf5 1.12.0

[Stuart Henderson]

On 2020/12/01 21:01, Martin Reindl wrote:
> The attached diff updates math/hdf5 to the latest version 1.12.0.
> 
> - enable fortran
> - API changes require major bump to all shlib
> - use configure argument for example dir instead of post-install mv(1)
> - pull patches from upstream to respect DESTDIR for examples
>   
> (https://github.com/HDFGroup/hdf5/commit/4cebd8aa6c965fe2e5dde6dbff36b2be3ca58bf1)
> - patch h5repack_plugin.sh test to work with our cp(1)
> 
> The extensive hdf5 test-suite passes on amd64. My arm64 is too slow so it 
> runs into
> the test timeout. Checking currently if raising HDF5_ALARM_SECONDS helps.
> Also tested on sparc64, but fheap tests fail there.
> 
> Also compile and partially run-time tested where especially relevant to me:
> math/armadillo

This breaks for me:

===>  Building for armadillo-9.800.1
[1/4] /pobj/armadillo-9.800.1/bin/c++  -Darmadillo_EXPORTS -Itmp/include 
-I/usr/local/include -O2 -pipe -DNDEBUG -fPIC
 -MD -MT CMakeFiles/armadillo.dir/src/wrapper1.cpp.o -MF 
CMakeFiles/armadillo.dir/src/wrapper1.cpp.o.d -o CMakeFiles/a
rmadillo.dir/src/wrapper1.cpp.o -c 
/pobj/armadillo-9.800.1/armadillo-9.800.1/src/wrapper1.cpp
FAILED: CMakeFiles/armadillo.dir/src/wrapper1.cpp.o 
/pobj/armadillo-9.800.1/bin/c++  -Darmadillo_EXPORTS -Itmp/include 
-I/usr/local/include -O2 -pipe -DNDEBUG -fPIC -MD -
MT CMakeFiles/armadillo.dir/src/wrapper1.cpp.o -MF 
CMakeFiles/armadillo.dir/src/wrapper1.cpp.o.d -o CMakeFiles/armadil
lo.dir/src/wrapper1.cpp.o -c 
/pobj/armadillo-9.800.1/armadillo-9.800.1/src/wrapper1.cpp
/pobj/armadillo-9.800.1/armadillo-9.800.1/src/wrapper1.cpp:1697:14: error: no 
matching function for call to 'H5Ovisit3
'
  return H5Ovisit(object_id, index_type, order, op, op_data);
 ^~~~
/usr/local/include/H5version.h:785:20: note: expanded from macro 'H5Ovisit'
  #define H5Ovisit H5Ovisit3
   ^
/usr/local/include/H5Opublic.h:211:15: note: candidate function not viable: 
requires 6 arguments, but 5 were provided
H5_DLL herr_t H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t 
order,
  ^
1 error generated.
ninja: build stopped: subcommand failed.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 05:48:22

Modified files:
x11/freerdp: Makefile 

Log message:
freerdp: extend the comment about timer_create etc.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 05:21:19

Modified files:
security/openssl/1.1: Tag: OPENBSD_6_8 Makefile 
Added files:
security/openssl/1.1/patches: Tag: OPENBSD_6_8 
  patch-crypto_bio_b_sock2_c 

Log message:
openssl/1.1: fix up IPV6_V6ONLY in -stable

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 05:00:12

Modified files:
net/nagios/nsca-ng: Makefile 

Log message:
nsca-ng: switch back to openssl/1.1. drop RUN_DEPENDS while there,
it was only allowing nagios/icinga1, but also works with icinga2.
there's not a lot of point having it as a forced dep anyway.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 04:58:48

Modified files:
security/openssl/1.1: Makefile 
security/openssl/1.1/patches: patch-crypto_bio_b_sock2_c 

Log message:
doh, i fail at #ifdef. actually fix previous issue.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/12/03 04:38:42

Modified files:
security/openssl/1.1/patches: patch-crypto_bio_b_sock2_c 

Log message:
add a comment about the IPV6_V6ONLY patch:

On OpenBSD, setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, ...) only allows
setting to 1 (which is the default anyway). Setting to 0 results in EINVAL.

This doesn't fix everything, there are still some other problems with binds
to v6 addresses with OpenSSL 1.1 on OpenBSD.

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2020/12/03 02:32:30

Modified files:
net/axel   : Makefile distinfo 
net/axel/pkg   : PLIST 

Log message:
Update for Axel to 2.17.10

Thanks sthen@ for the help :)

OK sthen@

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/12/03 01:08:24

Modified files:
net/py-IP  : Makefile distinfo 
net/py-IP/pkg  : PLIST 

Log message:
Update to py-IP-1.01.