CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ke...@cvs.openbsd.org 2022/02/28 21:16:19 Modified files: fonts/zh-iansui: Makefile distinfo Log message: Update zh-iansui to 0.940 ok kmos@
Re: [UPDATE] fonts/zh-iansui to 0.940
On Tue, Mar 01, 2022 at 10:44:11AM +0800, Kevin Lo wrote:
> Hi,
> This updates zh-iansu to the latest release, ok?
ok kmos
--Kurt
> Index: fonts/zh-iansui/Makefile
> ===
> RCS file: /cvs/ports/fonts/zh-iansui/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 Makefile
> --- fonts/zh-iansui/Makefile 20 Jan 2022 00:54:58 - 1.1.1.1
> +++ fonts/zh-iansui/Makefile 1 Mar 2022 02:40:54 -
> @@ -2,7 +2,7 @@
>
> COMMENT =Chinese truetype font derived from Klee One
>
> -V = 0.910
> +V = 0.940
> PKGNAME =zh-iansui-${V}
>
> GH_ACCOUNT = ButTaiwan
> @@ -25,7 +25,7 @@ FONTDIR = ${PREFIX}/share/fonts/iansui
>
> do-install:
> ${INSTALL_DATA_DIR} ${FONTDIR}
> - ${INSTALL_DATA} ${WRKSRC}/Iansui0.91-Regular.ttf \
> + ${INSTALL_DATA} ${WRKSRC}/Iansui${V:S/.//:C/.$//}-Regular.ttf \
> ${FONTDIR}/Iansui-Regular.ttf
>
> .include
> Index: fonts/zh-iansui/distinfo
> ===
> RCS file: /cvs/ports/fonts/zh-iansui/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- fonts/zh-iansui/distinfo 20 Jan 2022 00:54:58 - 1.1.1.1
> +++ fonts/zh-iansui/distinfo 1 Mar 2022 02:40:54 -
> @@ -1,2 +1,2 @@
> -SHA256 (iansui-0.910.tar.gz) = RpT5tPpHfA5R1Bq+H4jQQ3H8mGcHIVdqvjxu4zVUznU=
> -SIZE (iansui-0.910.tar.gz) = 5360237
> +SHA256 (iansui-0.940.tar.gz) = 9/gb5RPXDIBOR8bqE/Lus5lN44VVWcVT1cX/uwnR1Oc=
> +SIZE (iansui-0.940.tar.gz) = 6203724
>
[sparc64] Fix build of games/vkquake
Build of sparc64 fails with: gl_draw.c: In function 'Draw_PicFromWad2': gl_draw.c:285: warning: array size (4) smaller than bound length (24) gl_draw.c:285: warning: array size (4) smaller than bound length (24) gl_draw.c: In function 'Draw_TryCachePic': gl_draw.c:354: warning: array size (4) smaller than bound length (24) gl_draw.c:354: warning: array size (4) smaller than bound length (24) gl_draw.c: In function 'Draw_MakePic': Since it has -Werror, those warnings kill it. This patch drops -Werror and allows it to build on sparc64. ok? (cc maintainer) --Kurt Index: patches/patch-Quake_Makefile === RCS file: /cvs/ports/games/vkquake/patches/patch-Quake_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-Quake_Makefile --- patches/patch-Quake_Makefile29 Nov 2021 06:40:43 - 1.3 +++ patches/patch-Quake_Makefile1 Mar 2022 00:36:57 - @@ -5,6 +5,24 @@ remove hardcoded optimization flag Index: Quake/Makefile --- Quake/Makefile.orig +++ Quake/Makefile +@@ -28,7 +28,7 @@ VORBISLIB=vorbis + # Helper functions + # --- + +-check_gcc = $(shell if echo | $(CC) $(1) -Werror -S -o /dev/null -xc - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;) ++check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;) + + # --- + +@@ -48,7 +48,7 @@ STRIP ?= strip + CPUFLAGS= + DFLAGS ?= + CFLAGS ?= +-CFLAGS += -Wall -Wno-trigraphs -Wno-unused-function -Werror -std=gnu99 ++CFLAGS += -Wall -Wno-trigraphs -Wno-unused-function -std=gnu99 + CFLAGS += $(CPUFLAGS) + ifneq ($(DEBUG),0) + DFLAGS += -D_DEBUG @@ -56,7 +56,6 @@ CFLAGS += -g do_strip= else
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/02/28 19:52:42 Modified files: net/bird/2 : Makefile Log message: Build on sparc64 fails with: cc -std=gnu99 -Iobj -I. -O2 -pipe -I/usr/local/include -pthread -fno-strict-aliasing -fno-strict-overflow -MMD -MP -o obj/lib/blake2s.o -c lib/blake2s.c lib/blake2s.c:45: error: expected declaration specifiers or '...' before 'sizeof' lib/blake2s.c:45: error: expected declaration specifiers or '...' before string constant lib/blake2s.c:45: warning: data definition has no type or storage class lib/blake2s.c:45: warning: type defaults to 'int' in declaration of '_Static_assert' gmake: *** [Makefile:112: obj/lib/blake2s.o] Error 1 Switch to ports-gcc on base-gcc arches Fixes the build on sparc64
[UPDATE] fonts/zh-iansui to 0.940
Hi,
This updates zh-iansu to the latest release, ok?
Index: fonts/zh-iansui/Makefile
===
RCS file: /cvs/ports/fonts/zh-iansui/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- fonts/zh-iansui/Makefile20 Jan 2022 00:54:58 - 1.1.1.1
+++ fonts/zh-iansui/Makefile1 Mar 2022 02:40:54 -
@@ -2,7 +2,7 @@
COMMENT = Chinese truetype font derived from Klee One
-V =0.910
+V =0.940
PKGNAME = zh-iansui-${V}
GH_ACCOUNT = ButTaiwan
@@ -25,7 +25,7 @@ FONTDIR = ${PREFIX}/share/fonts/iansui
do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/Iansui0.91-Regular.ttf \
+ ${INSTALL_DATA} ${WRKSRC}/Iansui${V:S/.//:C/.$//}-Regular.ttf \
${FONTDIR}/Iansui-Regular.ttf
.include
Index: fonts/zh-iansui/distinfo
===
RCS file: /cvs/ports/fonts/zh-iansui/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- fonts/zh-iansui/distinfo20 Jan 2022 00:54:58 - 1.1.1.1
+++ fonts/zh-iansui/distinfo1 Mar 2022 02:40:54 -
@@ -1,2 +1,2 @@
-SHA256 (iansui-0.910.tar.gz) = RpT5tPpHfA5R1Bq+H4jQQ3H8mGcHIVdqvjxu4zVUznU=
-SIZE (iansui-0.910.tar.gz) = 5360237
+SHA256 (iansui-0.940.tar.gz) = 9/gb5RPXDIBOR8bqE/Lus5lN44VVWcVT1cX/uwnR1Oc=
+SIZE (iansui-0.940.tar.gz) = 6203724
UPDATE: net/nextcloudclient-3.4.3
Hi.
Update for net/nextcloudclient v3.4.3
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.4.3
[stable-3.4] Remove Hirsute, add Jammy
[stable-3.4] Cmake option to disable proxy
[stable-3.4] ensure we emit a rename command for renamed files
Makes sure that sync engine terminates when an error happen
[stable-3.4] ensure that bulk upload network job errors are handled
[stable-3.4] Rollback local move on server move failure
[stable-3.4] Do not remove a folder that has files that were not
uploaded yet during propagation
Thank you for testing.
--
Adriano Barbosa
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 13 Feb 2022 16:38:30 - 1.29
+++ Makefile 1 Mar 2022 00:11:14 -
@@ -4,9 +4,8 @@ USE_WXNEEDED = Yes
COMMENT = desktop sync client for Nextcloud
-V = 3.4.2
+V = 3.4.3
DISTNAME = nextcloudclient-${V}
-REVISION = 0
GH_ACCOUNT = nextcloud
GH_PROJECT = desktop
@@ -16,8 +15,8 @@ CATEGORIES = net
HOMEPAGE = https://nextcloud.com
-SHARED_LIBS += nextcloudsync1.0 # 3.4.0
-SHARED_LIBS += nextcloud_csync 1.0 # 3.4.0
+SHARED_LIBS += nextcloudsync1.1 # 3.4.3
+SHARED_LIBS += nextcloud_csync 1.1 # 3.4.3
MAINTAINER = Adriano Barbosa
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 4 Feb 2022 17:32:53 - 1.25
+++ distinfo 1 Mar 2022 00:11:14 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.4.2.tar.gz) = JRnSMp4Z+AVgmqkqpLy8C4r7+2iwZ+ljqoSdpQsjbF0=
-SIZE (nextcloudclient-3.4.2.tar.gz) = 14329069
+SHA256 (nextcloudclient-3.4.3.tar.gz) = MlFzclm/azICCuCdclzKXXyqQ4lQPbIlDfNJ4pYTVdQ=
+SIZE (nextcloudclient-3.4.3.tar.gz) = 14338935
Re: [UPDATE] lang/nim to 1.6.4
On 2022/03/01 00:41, Volker Schlecht wrote:
> + # _pbuild can't open outbound TCP connections
> + rm -rf ${WRKSRC}/tests/stdlib/tnetconnect.nim
I don't know a lot about nim, but IMHO it's often helpful to keep
network tests in ports, even if they're usually disabled for people
using PORTS_PRIVSEP the pf rule can be commented-out if you're
wanting to investigate something to do with network-related tests.
Re: UPDATE: devel/abseil-cpp - some fixes and turning on tests
On Fri, Feb 25, 2022 at 07:37:30PM +, Klemens Nanni wrote:
> On Fri, Feb 25, 2022 at 03:29:52AM +0300, Andrew Krasavin wrote:
> > On Thu, Feb 24, 2022 at 09:29:13AM +0100, Omar Polo wrote:
> > > Hello,
> > >
> > > the patch is malformed and don't apply :/
> > >
> > > Patching file Makefile using Plan A...
> > > patch: malformed patch at line 52: @@ -99,6 +100,19 @@
> > > CONFIGURE_ARGS += -DCMAKE_CXX_STANDARD=17
> > >
> > > Just a quick comment thought, the `find | xargs ls' machinery in
> > > pre-test is quite fragile and will break if we forget to sync it with
> > > the next update (or if we need to bump only some of the libraries.)
> > > Assuming that it's required for the tests (I haven't looked into it yet)
> > > I'd either go with "*\.so\..\.." or *\.so\.*\.*, or something along
> > > these lines.
> > >
> > > Thanks
> >
> > Oh, I'm sorry. It's not the first time this has happened with me( I
> > promise to make an effort and be careful not to send any more
> > corrupted diffs.
> > I also apologize for the late response.
> >
> > Thank you for your comment, I fixed it as you suggested.
>
> Here's a diff that applies (needs `sed 's,^ , ,'` to strip leading
> spaces).
>
> sparc64 fails to build with this, I can look into fixing this later:
>
>
> /usr/ports/pobj/abseil-cpp-20211102.0/bin/c++
> -DGTEST_LINKED_AS_SHARED_LIBRARY=1
> -I/usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0 -isystem
> /usr/local/include -O2 -pipe -DNDEBUG -Wall -Wextra -Wcast-qual
> -Wconversion-null -Wformat-security -Wmissing-declarations
> -Woverlength-strings -Wpointer-arith -Wundef -Wunused-local-typedefs
> -Wunused-result -Wvarargs -Wvla -Wwrite-strings -DNOMINMAX
> -Wno-conversion-null -Wno-deprecated-declarations -Wno-missing-declarations
> -Wno-sign-compare -Wno-unused-function -Wno-unused-parameter
> -Wno-unused-private-field -std=gnu++17 -MD -MT
> absl/hash/CMakeFiles/absl_hash_test.dir/hash_test.cc.o -MF
> absl/hash/CMakeFiles/absl_hash_test.dir/hash_test.cc.o.d -o
> absl/hash/CMakeFiles/absl_hash_test.dir/hash_test.cc.o -c
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash_test.cc
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash_test.cc:
> In instantiation of 'struct
> {anonymous}::IsAggregateInitializable
> >':
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash_test.cc:639:3:
>required from here
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash_test.cc:614:22:
> error: use of deleted function
> 'absl::lts_20211102::hash_internal::PoisonedHash::PoisonedHash()'
> : std::true_type {};
> ^
> In file included from
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash.h:78,
> from
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash_test.cc:15:
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/internal/hash.h:1021:3:
> note: declared here
>PoisonedHash() = delete;
>^~~~
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash_test.cc:614:22:
> error: use of deleted function
> 'absl::lts_20211102::hash_internal::PoisonedHash::PoisonedHash()'
> : std::true_type {};
> ^
> In file included from
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash.h:78,
> from
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/hash_test.cc:15:
> /usr/ports/pobj/abseil-cpp-20211102.0/abseil-cpp-20211102.0/absl/hash/internal/hash.h:1021:3:
> note: declared here
>PoisonedHash() = delete;
I have no fix for this but would like to get tests enabled where
possible.
Since enabling tests breaks the build and thus the package, how about
disabling tests on sparc6?
I guess some other arch will fail as well, but we can still fix that
once bulk reports come in.
Until then, at least amd64 gets test coverage and we can work on it
in-tree.
Feedback? Objection? OK?
In case nothing comes up I'll just commit this in a few days.
Index: Makefile
===
RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile18 Dec 2021 19:38:17 - 1.1.1.1
+++ Makefile28 Feb 2022 23:04:30 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2021/12/18 19:38:17 kn Exp $
COMMENT = abseil common libraries (c++)
+REVISION = 0
CATEGORIES = devel
GH_ACCOUNT = abseil
@@ -99,6 +100,25 @@ CONFIGURE_ARGS += -DCMAKE_CXX_STANDARD=1
# to ensure that our project builds correctly.
CONFIGURE_ARGS += -DABSL_PROPAGATE_CXX_STD:BOOL=ON
+.include
+.if ${MACHINE_ARCH} == "sparc64"
+# XXX hash/hash_test.cc:614:22: error: use of deleted function
'absl::lts_20211102::hash_internal::PoisonedHash::PoisonedHash()'
NO_TEST =
Re: update-patches
On Mon, Feb 28, 2022 at 10:12:38PM +, Stuart Henderson wrote: > On 2022/02/28 19:02, Marc Espie wrote: > > This kills both the generation and copying of $OpenBSD$ lines in > > update-patches. > > > > Main question is: are we okay generatin patches starting with Index: or > > do we want to leave an empty line (or something) reminding people to add > > an actual comment > > > > (that's the first chunk of the patch) > > I think it's fine like that, but it could have some handling for > an empty second line in existing patches, as-is it keeps them, > so after a while we'll have a mixture of some files with an > empty first line and others with the comment or patch on the > first line. > > Diff on top is not the prettiest but seems to do the trick. Oh, it's probably simpler to post-process the comment list before returning. Then there's no need to keep state. (It worked for just one line being simple enough) I'll have a look tomorrow unless you beat me to it.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/02/28 15:48:48 Modified files: net/tdesktop : Makefile Removed files: net/tdesktop/patches: patch-cmake_external_dispatch_CMakeLists_txt Log message: Remove obsolete patch disabling libdispatch lib_crl now detects dispatch and automatically fails back to Qt. tdesktop still configures if dispatch cannot be found, despite the warning/error.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2022/02/28 15:38:30 Modified files: infrastructure/lib/OpenBSD: TrackFile.pm Log message: forgo outputting CVSTags, okay sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 15:19:12 ports/net/snowflake_proxy/patches Update of /cvs/ports/net/snowflake_proxy/patches In directory cvs.openbsd.org:/tmp/cvs-serv84096/patches Log Message: Directory /cvs/ports/net/snowflake_proxy/patches added to the repository
Re: portcheck: drop $OpenBSD$ checks
On 2022/02/28 19:03, Marc Espie wrote:
> On Mon, Feb 28, 2022 at 04:14:25PM +0100, Christian Weisgerber wrote:
> > Drop all checks for $OpenBSD$ keywords from portcheck(1).
> >
> > Or should we instead complain if files do have $OpenBSD$?
>
> I think it's better if we have a policy, so complaining might be better.
I think so too, though it will take a while for people to get a newer
portcheck that complains.
> > Index: infrastructure/bin/portcheck
> > ===
> > RCS file: /cvs/ports/infrastructure/bin/portcheck,v
> > retrieving revision 1.140
> > diff -u -p -r1.140 portcheck
> > --- infrastructure/bin/portcheck6 Nov 2021 19:10:18 - 1.140
> > +++ infrastructure/bin/portcheck28 Feb 2022 15:08:44 -
> > @@ -1563,7 +1563,6 @@ check_files_dir() {
> >
> > # Checks made:
> > # * The patch is not empty.
> > -# * The patch contains an OpenBSD RCS tag.
> > check_patch() {
> > local F=$1
> >
> > @@ -1572,18 +1571,12 @@ check_patch() {
> > return
> > }
> >
> > - if [ -s "$F" ]; then
> > - head -n 1 -- "$F" | egrep -q '^\$OpenBSD.*\$$' ||
> > - err "$F does not have \$OpenBSD\$ RCS tag at the top"
> > - else
> > - err "$F is empty and should be removed"
> > - fi
> > + [[ -s $F ]] || err "$F is empty and should be removed"
> >
> > check_dos_line_endings "$F"
> > }
> >
> > # Checks made:
> > -# * Each patch contains OpenBSD RCS tag.
> > # * Directory is not empty and consists only of plain files starting
> > # with 'patch-' and not ending with '.orig'.
> > check_patches_dir() {
> > @@ -1614,8 +1607,6 @@ check_patches_dir() {
> >
> > # Checks made:
> > # * Directory is not empty and consist only of plain files with fixed
> > names.
> > -# * PFRAG, PLIST, README and .rc files contain appropriate OpenBSD RCS
> > -# tags; other files should NOT contain OpenBSD RCS tag.
> > # * PFRAG.shared should be merged into PLIST.
> > # * No trailing whitespace for DESCR, MESSAGE, README, UNMESSAGE and
> > # .rc files (PLIST and PFRAG are better checked with "make package").
> > @@ -1647,8 +1638,6 @@ check_pkg_dir() {
> > check_long_lines "$F"
> > check_hardcoded "$F"
> > [[ -n $subst_cmd ]] && check_subst_vars "$F" "$subst_cmd"
> > - egrep -q '\$OpenBSD.*\$' "$F" &&
> > - err "$F should not contain \$OpenBSD\$ tag"
> > ;;
> >
> > PFRAG.shared?(-*))
> > @@ -1673,9 +1662,6 @@ check_pkg_dir() {
> > check_newline_at_eof "$F"
> > check_long_lines "$F"
> > check_hardcoded "$F"
> > - head -n 1 -- "$F" |
> > - egrep -q '^(#[[:space:]]*)?\$OpenBSD(:.*)?\$$' ||
> > - err "$F does not have \$OpenBSD\$ RCS tag at the top"
> > ;;
> >
> > *.rc)
> > @@ -1687,9 +1673,6 @@ check_pkg_dir() {
> > check_long_lines "$F"
> > check_hardcoded "$F"
> > check_rcscript "$dir" "${F##*/}"
> > - head -n 5 -- "$F" |
> > - egrep -q '^#[[:space:]]*\$OpenBSD(:.*)?\$$' ||
> > - err "$F does not have \$OpenBSD\$ RCS tag at the top"
> > ;;
> >
> > MESSAGE?(-*)|UNMESSAGE?(-*))
> > @@ -1700,8 +1683,6 @@ check_pkg_dir() {
> > check_newline_at_eof "$F"
> > check_long_lines "$F"
> > check_hardcoded "$F"
> > - egrep -q '\$OpenBSD.*\$' "$F" &&
> > - err "$F should not contain \$OpenBSD\$ tag"
> > ;;
> >
> > *)
> > @@ -1755,7 +1736,6 @@ check_long_lines() {
> > }
> >
> > # Checks made:
> > -# * There is an OpenBSD RCS tag at the top.
> > # * No items with ${FULLPKGNAME} are allowed, except readme.
> > # * No empty lines.
> > check_plist_file() {
> > @@ -1763,9 +1743,6 @@ check_plist_file() {
> >
> > [[ -f $1 ]] ||
> > err "$1 is not a file"
> > - head -n 1 -- "$1" |
> > - egrep -q '^@comment \$OpenBSD.*\$$' ||
> > - err "$1 does not have \$OpenBSD\$ RCS tag at the top"
> >
> > # Do not match just '${FULLPKGNAME}' because many ports use the
> > # following trick:
> > @@ -1793,7 +1770,6 @@ check_subst_vars() {
> > }
> >
> > # Checks made:
> > -# * Contains OpenBSD RCS tag at the top line.
> > # * No REVISION marks present in given file (unless in update mode).
> > # * Each REVISION mark presents only once.
> > # * BUILD_DEPENDS, MODULES and PERMIT_DISTFILES are not defined in
> > @@ -1811,9 +1787,6 @@ check_makefile() {
> > check_trailing_whitespace "$F"
> > check_long_lines "$F"
> > check_hardcoded "$F"
> > - head -n 1 -- "$F" |
> > - egrep -q '^#[[:space:]]*\$OpenBSD.*\$' ||
> > - err "$F does not have \$OpenBSD\$ RCS tag at the top"
> >
> > local iflevel=0 l lnum=0 revs= t r mkvars= var duprevfound
> >
Re: update-patches
On 2022/02/28 19:02, Marc Espie wrote:
> This kills both the generation and copying of $OpenBSD$ lines in
> update-patches.
>
> Main question is: are we okay generatin patches starting with Index: or
> do we want to leave an empty line (or something) reminding people to add
> an actual comment
>
> (that's the first chunk of the patch)
I think it's fine like that, but it could have some handling for
an empty second line in existing patches, as-is it keeps them,
so after a while we'll have a mixture of some files with an
empty first line and others with the comment or patch on the
first line.
Diff on top is not the prettiest but seems to do the trick.
--- update-patches.espieMon Feb 28 22:09:41 2022
+++ update-patches Mon Feb 28 22:09:23 2022
@@ -216,8 +216,12 @@ sub parse_existing_patch
{
my $filename = shift;
open (my $f, '<', $filename) or die "can't read existing $filename: $!";
- my (@comment, $src, @patch);
+ my (@comment, $src, @patch, $skipifblank);
while (<$f>) {
+ if (m/^$/ and $skipifblank and $. == 2) {
+ $skipifblank = 0;
+ next;
+ }
if (m/^Index:\s+(\S.*)/) {
$src = $1;
while (<$f>) {
@@ -236,8 +240,12 @@ sub parse_existing_patch
}
last;
}
- next if $_ =~ m/^|^\$OpenBSD?/ and $. == 1;
+ if ($_ =~ m/^|^\$OpenBSD?/ and $. == 1) {
+ $skipifblank = 1;
+ next;
+ }
push(@comment, $_);
+ $skipifblank = 0;
}
return {stem => $src, filename => $filename,
comment => \@comment, patch => \@patch};
> Index: update-patches
> ===
> RCS file: /cvs/ports/infrastructure/bin/update-patches,v
> retrieving revision 1.21
> diff -u -p -r1.21 update-patches
> --- update-patches9 Feb 2021 17:34:40 - 1.21
> +++ update-patches28 Feb 2022 18:00:37 -
> @@ -206,12 +206,10 @@ sub create_patch
> die "diff exited with an error";
> }
> }
> - my $comment = "!OpenBSD!\n";
> - $comment =~ tr/!/$/;
> may_fuzz_patch($stem, \@lines);
> return {stem => $stem, patch => \@lines,
> filename => patch_name($stem),
> - comment => [$comment, "\n"] };
> + comment => [] };
> }
>
> sub parse_existing_patch
> @@ -238,6 +236,7 @@ sub parse_existing_patch
> }
> last;
> }
> + next if $_ =~ m/^|^\$OpenBSD?/ and $. == 1;
> push(@comment, $_);
> }
> return {stem => $src, filename => $filename,
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2022/02/28 13:04:04 Modified files: www/sogo : Makefile distinfo www/sogo/pkg : PLIST Log message: update 5.4.0 -> 5.5.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2022/02/28 13:03:32 Modified files: www/sope : Makefile distinfo Log message: update 5.4.0 -> 5.5.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/02/28 12:05:26 Modified files: net/tg_owt : Makefile distinfo Log message: Use pending PR for libsrtp libressl fix
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2022/02/28 11:26:48 Modified files: lang/gerbil: Makefile Log message: mark as BROKEN: segmentation fault with gambit 4.9.4
stop update-plist from spewing out $OpenBSD$
There's more logic involved in CVSTag, but for now, just prevent the
writer from outputting anything, I can kill the remaining logic later.
Index: TrackFile.pm
===
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/TrackFile.pm,v
retrieving revision 1.3
diff -u -p -r1.3 TrackFile.pm
--- TrackFile.pm13 Feb 2022 17:42:28 - 1.3
+++ TrackFile.pm28 Feb 2022 18:09:03 -
@@ -359,5 +359,10 @@ sub prepare_backsubst
}
}
+package OpenBSD::PackingElement::CVSTag;
+sub prepare_restate
+{
+ undef;
+}
1;
Re: portcheck: drop $OpenBSD$ checks
On Mon, Feb 28, 2022 at 04:14:25PM +0100, Christian Weisgerber wrote:
> Drop all checks for $OpenBSD$ keywords from portcheck(1).
>
> Or should we instead complain if files do have $OpenBSD$?
I think it's better if we have a policy, so complaining might be better.
> Index: infrastructure/bin/portcheck
> ===
> RCS file: /cvs/ports/infrastructure/bin/portcheck,v
> retrieving revision 1.140
> diff -u -p -r1.140 portcheck
> --- infrastructure/bin/portcheck 6 Nov 2021 19:10:18 - 1.140
> +++ infrastructure/bin/portcheck 28 Feb 2022 15:08:44 -
> @@ -1563,7 +1563,6 @@ check_files_dir() {
>
> # Checks made:
> # * The patch is not empty.
> -# * The patch contains an OpenBSD RCS tag.
> check_patch() {
> local F=$1
>
> @@ -1572,18 +1571,12 @@ check_patch() {
> return
> }
>
> - if [ -s "$F" ]; then
> - head -n 1 -- "$F" | egrep -q '^\$OpenBSD.*\$$' ||
> - err "$F does not have \$OpenBSD\$ RCS tag at the top"
> - else
> - err "$F is empty and should be removed"
> - fi
> + [[ -s $F ]] || err "$F is empty and should be removed"
>
> check_dos_line_endings "$F"
> }
>
> # Checks made:
> -# * Each patch contains OpenBSD RCS tag.
> # * Directory is not empty and consists only of plain files starting
> # with 'patch-' and not ending with '.orig'.
> check_patches_dir() {
> @@ -1614,8 +1607,6 @@ check_patches_dir() {
>
> # Checks made:
> # * Directory is not empty and consist only of plain files with fixed
> names.
> -# * PFRAG, PLIST, README and .rc files contain appropriate OpenBSD RCS
> -# tags; other files should NOT contain OpenBSD RCS tag.
> # * PFRAG.shared should be merged into PLIST.
> # * No trailing whitespace for DESCR, MESSAGE, README, UNMESSAGE and
> # .rc files (PLIST and PFRAG are better checked with "make package").
> @@ -1647,8 +1638,6 @@ check_pkg_dir() {
> check_long_lines "$F"
> check_hardcoded "$F"
> [[ -n $subst_cmd ]] && check_subst_vars "$F" "$subst_cmd"
> - egrep -q '\$OpenBSD.*\$' "$F" &&
> - err "$F should not contain \$OpenBSD\$ tag"
> ;;
>
> PFRAG.shared?(-*))
> @@ -1673,9 +1662,6 @@ check_pkg_dir() {
> check_newline_at_eof "$F"
> check_long_lines "$F"
> check_hardcoded "$F"
> - head -n 1 -- "$F" |
> - egrep -q '^(#[[:space:]]*)?\$OpenBSD(:.*)?\$$' ||
> - err "$F does not have \$OpenBSD\$ RCS tag at the top"
> ;;
>
> *.rc)
> @@ -1687,9 +1673,6 @@ check_pkg_dir() {
> check_long_lines "$F"
> check_hardcoded "$F"
> check_rcscript "$dir" "${F##*/}"
> - head -n 5 -- "$F" |
> - egrep -q '^#[[:space:]]*\$OpenBSD(:.*)?\$$' ||
> - err "$F does not have \$OpenBSD\$ RCS tag at the top"
> ;;
>
> MESSAGE?(-*)|UNMESSAGE?(-*))
> @@ -1700,8 +1683,6 @@ check_pkg_dir() {
> check_newline_at_eof "$F"
> check_long_lines "$F"
> check_hardcoded "$F"
> - egrep -q '\$OpenBSD.*\$' "$F" &&
> - err "$F should not contain \$OpenBSD\$ tag"
> ;;
>
> *)
> @@ -1755,7 +1736,6 @@ check_long_lines() {
> }
>
> # Checks made:
> -# * There is an OpenBSD RCS tag at the top.
> # * No items with ${FULLPKGNAME} are allowed, except readme.
> # * No empty lines.
> check_plist_file() {
> @@ -1763,9 +1743,6 @@ check_plist_file() {
>
> [[ -f $1 ]] ||
> err "$1 is not a file"
> - head -n 1 -- "$1" |
> - egrep -q '^@comment \$OpenBSD.*\$$' ||
> - err "$1 does not have \$OpenBSD\$ RCS tag at the top"
>
> # Do not match just '${FULLPKGNAME}' because many ports use the
> # following trick:
> @@ -1793,7 +1770,6 @@ check_subst_vars() {
> }
>
> # Checks made:
> -# * Contains OpenBSD RCS tag at the top line.
> # * No REVISION marks present in given file (unless in update mode).
> # * Each REVISION mark presents only once.
> # * BUILD_DEPENDS, MODULES and PERMIT_DISTFILES are not defined in
> @@ -1811,9 +1787,6 @@ check_makefile() {
> check_trailing_whitespace "$F"
> check_long_lines "$F"
> check_hardcoded "$F"
> - head -n 1 -- "$F" |
> - egrep -q '^#[[:space:]]*\$OpenBSD.*\$' ||
> - err "$F does not have \$OpenBSD\$ RCS tag at the top"
>
> local iflevel=0 l lnum=0 revs= t r mkvars= var duprevfound
> # do not unset mkvars, having empty element(-s) is fine
> --
> Christian "naddy" Weisgerber na...@mips.inka.de
>
>
update-patches
This kills both the generation and copying of $OpenBSD$ lines in update-patches.
Main question is: are we okay generatin patches starting with Index: or
do we want to leave an empty line (or something) reminding people to add
an actual comment
(that's the first chunk of the patch)
Index: update-patches
===
RCS file: /cvs/ports/infrastructure/bin/update-patches,v
retrieving revision 1.21
diff -u -p -r1.21 update-patches
--- update-patches 9 Feb 2021 17:34:40 - 1.21
+++ update-patches 28 Feb 2022 18:00:37 -
@@ -206,12 +206,10 @@ sub create_patch
die "diff exited with an error";
}
}
- my $comment = "!OpenBSD!\n";
- $comment =~ tr/!/$/;
may_fuzz_patch($stem, \@lines);
return {stem => $stem, patch => \@lines,
filename => patch_name($stem),
- comment => [$comment, "\n"] };
+ comment => [] };
}
sub parse_existing_patch
@@ -238,6 +236,7 @@ sub parse_existing_patch
}
last;
}
+ next if $_ =~ m/^|^\$OpenBSD?/ and $. == 1;
push(@comment, $_);
}
return {stem => $src, filename => $filename,
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 11:01:53 Modified files: net/snowflake_proxy: Makefile net/snowflake_proxy/pkg: PLIST Log message: remove junk in @newgroup line, spotted by gman
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/02/28 10:34:04 Modified files: lang/nim/patches: patch-config_nim_cfg Added files: lang/nim/patches: patch-build_sh patch-dist_nimble_src_nimblepkg_options_nim Removed files: lang/nim/patches: patch-install_sh Log message: oops, missed some files in the last commit. reminded by Volker, thanks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 09:56:19 Modified files: net/snowflake_proxy: Makefile Log message: missing WANTLIB, spotted by tracey@, thanks :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 09:54:55 Modified files: infrastructure/db: user.list net: Makefile Log message: +net/snowflake_proxy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 09:54:14 Log message: import ports/net/snowflake_proxy, ok abieber@ Snowflake is a pluggable transport that can be used for Tor, usually for accessing the network when a user is on a connection with only partial internet access. It uses WebRTC negotiations for NAT traversal to connect to mostly short-lived volunteer proxies. These proxies can either be provided by running a web browser extension or a standalone proxy. Users behind restrictive access can use snowflake as a bridge, e.g. by configuring it in Tor Browser. Technical information is in https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/Technical%20Overview This package provides a proxy, for those who would like to use their internet connection to provide access to others via this protocol. Status: Vendor Tag: sthen Release Tags: sthen_20220228 N ports/net/snowflake_proxy/Makefile N ports/net/snowflake_proxy/distinfo N ports/net/snowflake_proxy/modules.inc N ports/net/snowflake_proxy/pkg/DESCR N ports/net/snowflake_proxy/pkg/PLIST N ports/net/snowflake_proxy/pkg/snowflake_proxy.rc No conflicts created by this import
Re: NEW: net/snowflake_proxy
On Mon, Feb 28, 2022 at 04:39:43PM +, Stuart Henderson wrote: > any OKs to import this? Missing WANTLIB += c pthread Otherwise ok. > > > $ pkg_info snowflake_proxy > Information for inst:snowflake_proxy-2.1.0 > > Comment: > proxy providing Tor access to others with censored net > > Description: > Snowflake is a pluggable transport that can be used for Tor, > usually for accessing the network when a user is on a connection > with only partial internet access. > > It uses WebRTC negotiations for NAT traversal to connect to mostly > short-lived volunteer proxies. These proxies can either be provided > by running a web browser extension or a standalone proxy. > > Users behind restrictive access can use snowflake as a bridge, > e.g. by configuring it in Tor Browser. > > Technical information is in > https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/Technical%20Overview > > This package provides a proxy, for those who would like to use their > internet connection to provide access to others via this protocol. > > Maintainer: The OpenBSD ports mailing-list > > WWW: https://snowflake.torproject.org/ > > > > Index: user.list > === > RCS file: /cvs/ports/infrastructure/db/user.list,v > retrieving revision 1.395 > diff -u -p -r1.395 user.list > --- user.list 16 Feb 2022 18:25:00 - 1.395 > +++ user.list 28 Feb 2022 16:38:34 - > @@ -382,3 +382,4 @@ id user group port > 871 _gelatod _gelatodnet/gelatod > 872 _vmetrics_vmetrics databases/victoriametrics > 873 _alertmanager_alertmanager sysutils/alertmanager > +874 _snowflakeproxy _snowflakeproxy net/snowflake_proxy > -- Tracey Emery
NEW: net/snowflake_proxy
any OKs to import this? $ pkg_info snowflake_proxy Information for inst:snowflake_proxy-2.1.0 Comment: proxy providing Tor access to others with censored net Description: Snowflake is a pluggable transport that can be used for Tor, usually for accessing the network when a user is on a connection with only partial internet access. It uses WebRTC negotiations for NAT traversal to connect to mostly short-lived volunteer proxies. These proxies can either be provided by running a web browser extension or a standalone proxy. Users behind restrictive access can use snowflake as a bridge, e.g. by configuring it in Tor Browser. Technical information is in https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/Technical%20Overview This package provides a proxy, for those who would like to use their internet connection to provide access to others via this protocol. Maintainer: The OpenBSD ports mailing-list WWW: https://snowflake.torproject.org/ Index: user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.395 diff -u -p -r1.395 user.list --- user.list 16 Feb 2022 18:25:00 - 1.395 +++ user.list 28 Feb 2022 16:38:34 - @@ -382,3 +382,4 @@ id usergroup port 871 _gelatod _gelatodnet/gelatod 872 _vmetrics _vmetrics databases/victoriametrics 873 _alertmanager _alertmanager sysutils/alertmanager +874 _snowflakeproxy_snowflakeproxy net/snowflake_proxy snowflake_proxy.tgz Description: application/tar-gz
Re: [UPDATE] security/stunnel to 5.62
> Updates security/stunnel to 5.62 > > Lots of changes, some of which are marked with urgency 'HIGH' and which > might affect OpenBSD users as well: https://www.stunnel.org/NEWS.html > > Upstream seems to be opposed to having stunnel linked with LibreSSL, and the > changes between 5.44 (currently in ports) and 5.62 would need a substantial > amount of patches just to make it compile. Since I don't have the insight > necessary not to introduce a bug by doing so, I built it against OpenSSL > from ports, and thought I'd just throw it out there for discussion. Yes, it's needed some LIBRESSL_VERSION_NUMBER dance to make it compile. I have already a patch that makes it compile against libressl, slight tested though, I will tidy up and provide here yet today or tomorrow. > * Kept the sections for pop3s, imaps and ssmtp commented out in the default > /etc/stunnel.conf, since I personally can't think of a reason why I'd want > stunnel to listen on those ports by default ok > * Update mirror sites to those documented at > https://www.stunnel.org/downloads.html ... > > * Changed homepage and mirrors to use https > fine for both. Thanks for your work on it. gsoares
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 08:35:39 Modified files: devel/py-uncompyle6: Makefile distinfo devel/py-uncompyle6/pkg: PLIST Log message: update uncompyle6 to latest release, but mark broken as it doesn't handle Python 3.9.10 yet
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 08:28:28 Modified files: devel/py-xdis : Makefile distinfo devel/py-xdis/pkg: PLIST Added files: devel/py-xdis/patches: patch-xdis_magics_py Log message: update to py3-xdis-6.0.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 08:27:55 ports/devel/py-xdis/patches Update of /cvs/ports/devel/py-xdis/patches In directory cvs.openbsd.org:/tmp/cvs-serv34356/patches Log Message: Directory /cvs/ports/devel/py-xdis/patches added to the repository
portcheck: drop $OpenBSD$ checks
Drop all checks for $OpenBSD$ keywords from portcheck(1).
Or should we instead complain if files do have $OpenBSD$?
Index: infrastructure/bin/portcheck
===
RCS file: /cvs/ports/infrastructure/bin/portcheck,v
retrieving revision 1.140
diff -u -p -r1.140 portcheck
--- infrastructure/bin/portcheck6 Nov 2021 19:10:18 - 1.140
+++ infrastructure/bin/portcheck28 Feb 2022 15:08:44 -
@@ -1563,7 +1563,6 @@ check_files_dir() {
# Checks made:
# * The patch is not empty.
-# * The patch contains an OpenBSD RCS tag.
check_patch() {
local F=$1
@@ -1572,18 +1571,12 @@ check_patch() {
return
}
- if [ -s "$F" ]; then
- head -n 1 -- "$F" | egrep -q '^\$OpenBSD.*\$$' ||
- err "$F does not have \$OpenBSD\$ RCS tag at the top"
- else
- err "$F is empty and should be removed"
- fi
+ [[ -s $F ]] || err "$F is empty and should be removed"
check_dos_line_endings "$F"
}
# Checks made:
-# * Each patch contains OpenBSD RCS tag.
# * Directory is not empty and consists only of plain files starting
# with 'patch-' and not ending with '.orig'.
check_patches_dir() {
@@ -1614,8 +1607,6 @@ check_patches_dir() {
# Checks made:
# * Directory is not empty and consist only of plain files with fixed names.
-# * PFRAG, PLIST, README and .rc files contain appropriate OpenBSD RCS
-# tags; other files should NOT contain OpenBSD RCS tag.
# * PFRAG.shared should be merged into PLIST.
# * No trailing whitespace for DESCR, MESSAGE, README, UNMESSAGE and
# .rc files (PLIST and PFRAG are better checked with "make package").
@@ -1647,8 +1638,6 @@ check_pkg_dir() {
check_long_lines "$F"
check_hardcoded "$F"
[[ -n $subst_cmd ]] && check_subst_vars "$F" "$subst_cmd"
- egrep -q '\$OpenBSD.*\$' "$F" &&
- err "$F should not contain \$OpenBSD\$ tag"
;;
PFRAG.shared?(-*))
@@ -1673,9 +1662,6 @@ check_pkg_dir() {
check_newline_at_eof "$F"
check_long_lines "$F"
check_hardcoded "$F"
- head -n 1 -- "$F" |
- egrep -q '^(#[[:space:]]*)?\$OpenBSD(:.*)?\$$' ||
- err "$F does not have \$OpenBSD\$ RCS tag at the top"
;;
*.rc)
@@ -1687,9 +1673,6 @@ check_pkg_dir() {
check_long_lines "$F"
check_hardcoded "$F"
check_rcscript "$dir" "${F##*/}"
- head -n 5 -- "$F" |
- egrep -q '^#[[:space:]]*\$OpenBSD(:.*)?\$$' ||
- err "$F does not have \$OpenBSD\$ RCS tag at the top"
;;
MESSAGE?(-*)|UNMESSAGE?(-*))
@@ -1700,8 +1683,6 @@ check_pkg_dir() {
check_newline_at_eof "$F"
check_long_lines "$F"
check_hardcoded "$F"
- egrep -q '\$OpenBSD.*\$' "$F" &&
- err "$F should not contain \$OpenBSD\$ tag"
;;
*)
@@ -1755,7 +1736,6 @@ check_long_lines() {
}
# Checks made:
-# * There is an OpenBSD RCS tag at the top.
# * No items with ${FULLPKGNAME} are allowed, except readme.
# * No empty lines.
check_plist_file() {
@@ -1763,9 +1743,6 @@ check_plist_file() {
[[ -f $1 ]] ||
err "$1 is not a file"
- head -n 1 -- "$1" |
- egrep -q '^@comment \$OpenBSD.*\$$' ||
- err "$1 does not have \$OpenBSD\$ RCS tag at the top"
# Do not match just '${FULLPKGNAME}' because many ports use the
# following trick:
@@ -1793,7 +1770,6 @@ check_subst_vars() {
}
# Checks made:
-# * Contains OpenBSD RCS tag at the top line.
# * No REVISION marks present in given file (unless in update mode).
# * Each REVISION mark presents only once.
# * BUILD_DEPENDS, MODULES and PERMIT_DISTFILES are not defined in
@@ -1811,9 +1787,6 @@ check_makefile() {
check_trailing_whitespace "$F"
check_long_lines "$F"
check_hardcoded "$F"
- head -n 1 -- "$F" |
- egrep -q '^#[[:space:]]*\$OpenBSD.*\$' ||
- err "$F does not have \$OpenBSD\$ RCS tag at the top"
local iflevel=0 l lnum=0 revs= t r mkvars= var duprevfound
# do not unset mkvars, having empty element(-s) is fine
--
Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 08:15:12 Modified files: textproc/py-jellyfish: Makefile distinfo Log message: update to py3-jellyfish-0.9.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 08:12:52 Modified files: www/py-multidict: Makefile distinfo www/py-multidict/pkg: PLIST Log message: update to py3-multidict-6.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 08:12:08 Modified files: www/py-yarl: Makefile Log message: fix tests
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 08:09:22 Modified files: www/py-uritemplate: Makefile distinfo www/py-uritemplate/pkg: PLIST Log message: update to py3-uritemplate-4.1.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2022/02/28 08:01:03
Modified files:
textproc/py-black: Makefile
Log message:
add missing ${MODPY_FLAVOR} in TEST_DEPENDS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 07:57:06 Modified files: www/py-genshi : Makefile distinfo Removed files: www/py-genshi/patches: patch-setup_py Log message: update to py3-genshi-0.7.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 07:53:12 Modified files: textproc/py-cssutils: Makefile distinfo Log message: update to py3-cssutils-2.4.0
Re: Can't install mongodb-3.2.22p5->3.4.24: can't resolve snappy-1.1.9
On 2022/02/27 15:25, David Higgs wrote: > I was updating my staging VM and encountered the following hiccup(s). > > [vm@mail ~]$ doas pkg_add -u -Dsnap > quirks-4.104 signed on 2022-02-27T16:24:16Z > Can't find snappy-1.1.9 > mongodb-3.4.24:libstemmer-2.1.0: ok > Can't install mongodb-3.2.22p5->3.4.24: can't resolve snappy-1.1.9 > Couldn't find updates for mongodb-3.2.22p5 unifi-6.5.55p3 > Couldn't install mongodb-3.4.24 snappy-1.1.9 > > This seemed a bit odd; I thought that dependencies were automatically > installed. I manually installed snappy and then pkg_add updated mongodb > successfully. > > [vm@mail ~]$ doas pkg_add -Dsnap snappy > quirks-4.104 signed on 2022-02-27T16:24:16Z > snappy-1.1.9: ok > [vm@mail ~]$ doas pkg_add -u -Dsnap > quirks-4.104 signed on 2022-02-27T16:24:16Z > mongodb-3.2.22p5->3.4.24: ok > Read shared items: ok > Couldn't find updates for unifi-6.5.55p3 > > Everything seems fine now, but did I do something wrong to get into this > state? Or was this a temporary blip in package availability? > > Thanks. > > --david Can't say for sure without more info (at least a directory listing at the time of the problem) but most likely you caught a mirror partway through an update.
Can't install mongodb-3.2.22p5->3.4.24: can't resolve snappy-1.1.9
I was updating my staging VM and encountered the following hiccup(s). [vm@mail ~]$ doas pkg_add -u -Dsnap quirks-4.104 signed on 2022-02-27T16:24:16Z Can't find snappy-1.1.9 mongodb-3.4.24:libstemmer-2.1.0: ok Can't install mongodb-3.2.22p5->3.4.24: can't resolve snappy-1.1.9 Couldn't find updates for mongodb-3.2.22p5 unifi-6.5.55p3 Couldn't install mongodb-3.4.24 snappy-1.1.9 This seemed a bit odd; I thought that dependencies were automatically installed. I manually installed snappy and then pkg_add updated mongodb successfully. [vm@mail ~]$ doas pkg_add -Dsnap snappy quirks-4.104 signed on 2022-02-27T16:24:16Z snappy-1.1.9: ok [vm@mail ~]$ doas pkg_add -u -Dsnap quirks-4.104 signed on 2022-02-27T16:24:16Z mongodb-3.2.22p5->3.4.24: ok Read shared items: ok Couldn't find updates for unifi-6.5.55p3 Everything seems fine now, but did I do something wrong to get into this state? Or was this a temporary blip in package availability? Thanks. --david
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2022/02/28 07:07:45 Modified files: infrastructure/bin: register-plist Log message: allow @comment $OpenBSD$ lines to vanish without a trace. okay sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 06:24:49 Modified files: devel/py-test-xdist: Makefile distinfo devel/py-test-xdist/pkg: PLIST Removed files: devel/py-test-xdist/patches: patch-testing_acceptance_test_py Log message: update to py3-test-xdist-2.5.0
Re: [UPDATE] lang/nim to 1.6.4
Stuart Henderson wrote: > On 2022/02/28 12:40, Volker Schlecht wrote: > > > > > > Volker Schlecht wrote: > > > > > It uses fork instead of posix_spawn ... both OpenBSD and FreeBSD > > > > > remove > > > > > that line in their ports, though. NetBSD keeps it as it is. > > > > > > > > > > It was added by upstream 8 years ago, and the comment refers to > > > > > posix_spawn being new to BSDs at the time. > > > > > > so that part of the patch can probably be garbage-collected now? > > > > Not quite. The configuration from *upstream* wants to use fork instead of > > posix_spawn, and they made that decision 8 years ago. > > > > Our own patch reverts that upstream configuration and makes it use > > posix_spawn instead. FreeBSD has a patch to the same effect: > > > > https://cgit.freebsd.org/ports/tree/lang/nim/files/patch-config-nim.cfg > > > > Unless we have a problem with posix_spawn, I'd keep it in. > > > > Ah I misread it. That's fine then. op@, OK with the PORTHOME change suggested > by tb. Committed, thanks! ;)
register-plist patch
This should allow zapping $OpenBSD$ lines in plists without any negative
side-effects.
Index: register-plist
===
RCS file: /cvs/ports/infrastructure/bin/register-plist,v
retrieving revision 1.28
diff -u -p -r1.28 register-plist
--- register-plist 6 Oct 2021 13:56:50 - 1.28
+++ register-plist 28 Feb 2022 13:14:09 -
@@ -138,6 +138,12 @@ sub save_stuff
{
}
+# to be used for stuff that we no longer want
+sub may_vanish
+{
+ 0
+}
+
package OpenBSD::PackingElement::Manpage;
sub save_stuff
{
@@ -345,6 +351,11 @@ package OpenBSD::PackingElement::CVSTag;
our $openbsd = 'OpenBSD';
+sub may_vanish
+{
+ 1
+}
+
sub forget_details
{
my $self = shift;
@@ -513,6 +524,15 @@ sub my_compare
my $e2 = shift @$l2;
if (!defined $e2) {
return combine(Result::Different, $seen_stop);
+ }
+ # zap stuff that's no longer relevant, unless it's still
+ # there and we want to keep it identical
+ if ($e2->may_vanish && ref($e) ne ref($e2)) {
+ $e2 = shift @$l2;
+ if (!defined $e2) {
+ return combine(Result::Different, $seen_stop);
+ }
+ $seen_stop = combine(Result::Updatable, $seen_stop);
}
my $r = $e->compare($e2);
if ($r == Result::Different) {
Re: net/amfora 1.9.2
Dimitri Karamazov wrote: > Thanks Omar for the diff and Stuart for the tip, the update by > Dmitrij D. Czarkoff indeed works. Thanks, committed! Cheers Omar Polo > regards, > Dimitri
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/02/28 05:57:34 Modified files: net/amfora : Makefile distinfo modules.inc Log message: update amfora to v1.9.2 changelog: - https://github.com/makeworld-the-better-one/amfora/releases/tag/v1.9.0 - https://github.com/makeworld-the-better-one/amfora/releases/tag/v1.9.1 - https://github.com/makeworld-the-better-one/amfora/releases/tag/v1.9.2 diff from czarkoff@, ok Dimitri Karamazov (maintainer) and sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/02/28 05:51:57 Modified files: net/toxic : Makefile distinfo Log message: update toxic to v0.11.3 changelog: https://github.com/TokTok/toxic/releases/tag/v0.11.3 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/02/28 05:50:52 Modified files: net/toxcore: Makefile distinfo net/toxcore/pkg: PLIST Log message: update toxcore to 0.2.16 changelog: https://github.com/TokTok/c-toxcore/releases/tag/v0.2.16 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:48:04 Modified files: security/openssl/libretls: Makefile distinfo Log message: update to libretls-3.5.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:47:50 Modified files: textproc/py-unidecode: Makefile distinfo Log message: update to py3-unidecode-1.3.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:43:11 Modified files: devel/py-test-httpbin: Makefile distinfo Log message: update to py3-test-httpbin-1.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:40:37 Modified files: devel/py-test-subtests: Makefile distinfo Log message: update to py3-pytest-subtests-0.6.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:37:55 Modified files: devel/py-test-cov: Makefile distinfo Log message: update to py3-test-cov-3.0.0
Re: [UPDATE] lang/nim to 1.6.4
On 2022/02/28 12:40, Volker Schlecht wrote: > > > > Volker Schlecht wrote: > > > > It uses fork instead of posix_spawn ... both OpenBSD and FreeBSD remove > > > > that line in their ports, though. NetBSD keeps it as it is. > > > > > > > > It was added by upstream 8 years ago, and the comment refers to > > > > posix_spawn being new to BSDs at the time. > > > > so that part of the patch can probably be garbage-collected now? > > Not quite. The configuration from *upstream* wants to use fork instead of > posix_spawn, and they made that decision 8 years ago. > > Our own patch reverts that upstream configuration and makes it use > posix_spawn instead. FreeBSD has a patch to the same effect: > > https://cgit.freebsd.org/ports/tree/lang/nim/files/patch-config-nim.cfg > > Unless we have a problem with posix_spawn, I'd keep it in. > Ah I misread it. That's fine then. op@, OK with the PORTHOME change suggested by tb.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:14:27 Modified files: devel/py-gitpython: Makefile distinfo devel/py-gitpython/pkg: PLIST Log message: update to py3-GitPython-3.1.27
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:14:23 Modified files: devel/py-gitdb : Makefile distinfo devel/py-gitdb/pkg: PLIST Log message: update to py3-gitdb-4.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 05:10:18 Modified files: devel/py-isodate: Makefile distinfo Log message: update to py3-isodate-0.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 04:59:11 Modified files: devel/py-coveralls: Makefile distinfo devel/py-coveralls/pkg: PLIST Log message: update to py3-coveralls-3.3.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 04:55:33 Modified files: devel/py-doit : Makefile distinfo Log message: update to doit-0.34.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 04:38:00 Modified files: databases/py-ldap: Makefile distinfo databases/py-ldap/pkg: PLIST Log message: update to py3-ldap-3.4.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 04:33:39 Modified files: databases/openldap: Makefile Log message: openldap: bump REVISION, there is a tight version check against libsasl 621cb2c7 slap_sasl_init: SASL library version mismatch: expected 2.1.28, got 2.1.27
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 04:31:39 Modified files: devel/py-crc32c: Makefile distinfo Log message: update to py3-crc32c-2.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 04:22:37 Modified files: devel/py-setuptools-rust: Makefile Log message: py-setuptools-rust: needs py-typing-extensions
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/02/28 04:01:14 Modified files: sysutils/borgbackup: Makefile.inc Log message: We have newer py-test now, enable all tests
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/02/28 04:00:42 Modified files: devel/py-test : Makefile Log message: py-test needs py-argcomplete and py-xmlschema as TDEP While here clean-up RDEP. Feedback and OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/02/28 03:59:54 Modified files: textproc : Makefile Log message: +py-elementpath and +py-xmlschema
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:59:51 Modified files: graphics/alembic: Makefile distinfo Log message: update to alembic-1.8.3, from Dimitri Karamazov (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:55:07 Modified files: www/qutebrowser: Makefile Log message: knock out py-adblock RDEP on i386 again, the rust parts of py-adblock are currently failing there
Re: CVS: cvs.openbsd.org: ports
On Mon 28/02/2022 03:51, Bjorn Ketelaars wrote: > CVSROOT: /cvs > Module name: ports > Changes by: b...@cvs.openbsd.org2022/02/28 03:51:47 > > Log message: > Import py-elementpath > > Status: > > Vendor Tag: bket > Release Tags: bket_20220228 > > N ports/textproc/py-elementpath/Makefile > N ports/textproc/py-elementpath/distinfo > N ports/textproc/py-elementpath/pkg/DESCR > N ports/textproc/py-elementpath/pkg/PLIST > > No conflicts created by this import Forgot to mention OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/02/28 03:54:04 Log message: Import py-xmlschema-1.9.2 DESCR: The xmlschema library is an implementation of XML Schema for Python. OK sthen@ Status: Vendor Tag: bket Release Tags: bket_20220228 N ports/textproc/py-xmlschema/Makefile N ports/textproc/py-xmlschema/distinfo N ports/textproc/py-xmlschema/pkg/DESCR N ports/textproc/py-xmlschema/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:53:49 Modified files: multimedia/libaacs: Makefile distinfo Log message: update to libaacs-0.11.1, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/02/28 03:51:47 Log message: Import py-elementpath Status: Vendor Tag: bket Release Tags: bket_20220228 N ports/textproc/py-elementpath/Makefile N ports/textproc/py-elementpath/distinfo N ports/textproc/py-elementpath/pkg/DESCR N ports/textproc/py-elementpath/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:49:54 Modified files: net/i2pd : Makefile distinfo net/i2pd/patches: patch-tests_Makefile net/i2pd/pkg : PLIST Log message: update to i2pd-2.41.0, from Dimitri Karamazov (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:47:55 Modified files: www/py-httpie : Makefile distinfo www/py-httpie/pkg: PLIST Log message: update to httpie-3.0.2, ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:46:26 Modified files: textproc : Makefile Log message: +py-charset-normalize
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:45:43 Log message: import ports/textproc/py-charset-normalizer, tweak/ok kmos@ charset-normalizer is a library that helps you read text from an unknown charset encoding. Performs a similar role to 'chardet' but takes a different approach and performs better. Status: Vendor Tag: sthen Release Tags: sthen_20220228 N ports/textproc/py-charset-normalizer/Makefile N ports/textproc/py-charset-normalizer/distinfo N ports/textproc/py-charset-normalizer/pkg/DESCR N ports/textproc/py-charset-normalizer/pkg/PLIST No conflicts created by this import
Re: www/py-httpie update, NEW: textproc/py-charset-normalizer
On 2022/02/27 18:09, Kurt Mosiejczuk wrote: > On Sun, Feb 27, 2022 at 01:54:17PM +, Stuart Henderson wrote: > > httpie updates require a new charset detection library, port for > > that attached. OK to import? > > It needs textproc/py-inicofig and devel/py-test-cov as TEST_DEPENDS. > Otherwise ok kmos for import ah, iniconfig was my omission in py-test, I'll let it pick that up via bket's diff instead > > httpie update diff using it inline. > > ok kmos Thanks :)
Re: [UPDATE] lang/nim to 1.6.4
Volker Schlecht wrote:
>
>
> > so here's another try. I'm still keeping ${CFLAGS} in the size case but
> > leaving -Os afterwards; can remove that if deemed extreme.
> >
> > Comments/OK/Thoughts?
>
> Can't give OKs, but looks good to me and I hope someone else OKs it soon ;)
thanks :)
I forgot about the tests thought, so here's another patch that makes
`make test' run. Some tests fails, but the majority seems to be
passing.
There's a small hack:
TEST_ENV = HOME=${WRKSRC}/test-home
but otherwise it complains that it can't mkdir
/.cache/ and I haven't found the right
incantation for it. --nimcache seems to be ignored for testament?
Index: Makefile
===
RCS file: /home/cvs/ports/lang/nim/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile2 May 2020 09:33:06 - 1.11
+++ Makefile28 Feb 2022 10:12:00 -
@@ -2,25 +2,27 @@
ONLY_FOR_ARCHS = i386 amd64
-BROKEN-i386 = hardcodes gcc; see config/nim.cfg
-
COMMENT = statically typed, imperative programming language
-VERSION = 1.2.0
-DISTNAME = nim-${VERSION}
+DISTNAME = nim-1.6.4
EXTRACT_SUFX = .tar.xz
-REVISION = 0
CATEGORIES = lang
-HOMEPAGE = http://nim-lang.org/
-MASTER_SITES = http://nim-lang.org/download/ \
- https://download.tuxfamily.org/jod/lang/nim/
+HOMEPAGE = https://nim-lang.org/
+MASTER_SITES = https://nim-lang.org/download/
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB = c m
+WANTLIB = c m pthread
+
+MODULES = lang/python
+
+TEST_ENV = HOME=${WRKSRC}/test-home
+TEST_DEPENDS = lang/node
+
+SUBST_VARS += CFLAGS
post-patch:
mkdir -p ${WRKSRC}/nimcache-port
@@ -29,26 +31,30 @@ post-patch:
perl -i -pe "s#NIM_PORT_CACHE#${WRKSRC}/nimcache-port-test#" \
${WRKSRC}/koch.nim
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/config/nim.cfg
+
do-build:
cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
+ COMP_FLAGS="${CPPFLAGS} ${CFLAGS}" LINK_FLAGS="${LDFLAGS}" \
CFLAGS="${CFLAGS}" sh build.sh
- # slow machines can get a head of themselves and fail to link
- cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \
+ cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:${MAKE_JOBS} \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}" koch
- cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
- --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
- --listCmd --putenv:"PATH=${PATH}"
- cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
+.for t in boot nimble tools
+ cd ${WRKSRC} && ./koch $t -d:release --parallelBuild:${MAKE_JOBS} \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}"
+.endfor
do-install:
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
+.for b in nim nimble nimpretty nimgrep nimsuggest testament
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/$b ${PREFIX}/bin
+.endfor
${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/lib/nim/pure/unidecode/gen.py
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
@@ -56,7 +62,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
do-test:
- cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \
+ cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ./koch tests all -d:release \
--parallelBuild:1 --listFullPaths --listCmd \
--nimcache:"${WRKSRC}/nimcache-port-test" \
--putenv:"PATH=${PATH}"
Index: distinfo
===
RCS file: /home/cvs/ports/lang/nim/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo2 May 2020 09:33:06 - 1.5
+++ distinfo27 Feb 2022 22:57:13 -
@@ -1,2 +1,2 @@
-SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
-SIZE (nim-1.2.0.tar.xz) = 5869428
+SHA256 (nim-1.6.4.tar.xz) = f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI=
+SIZE (nim-1.6.4.tar.xz) = 5130208
Index: patches/patch-build_sh
===
RCS file: patches/patch-build_sh
diff -N patches/patch-build_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-build_sh 27
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/02/28 03:44:11 Modified files: textproc/py-pygments: Makefile Log message: drop TDEP on py-iniconfig, bket@ found it should be added to py-test instead
Re: [UPDATE] lang/nim to 1.6.4
On 2022/02/28 10:06, Omar Polo wrote: > I wasn't trying to say that we should patch the nim compiler to always > respect $CFLAGS, but rather that it should respect $CFLAGS *during the > build*. My patch had the side-effect of persisting the build-time > $CFLAGS as default compiler flags for the generated package too (they > end up in /etc/nim/nim.cfg), which now I think it's probably a good > idea. > > (the rationale is that the port infrastructure should be always able to > decide which CFLAGS to use and the port should respect that.) agreed > Volker Schlecht wrote: > > It uses fork instead of posix_spawn ... both OpenBSD and FreeBSD remove > > that line in their ports, though. NetBSD keeps it as it is. > > > > It was added by upstream 8 years ago, and the comment refers to > > posix_spawn being new to BSDs at the time. so that part of the patch can probably be garbage-collected now?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/02/28 02:49:55 Modified files: print/hplip: Makefile distinfo print/hplip/patches: patch-Makefile_in patch-base_password_py patch-installer_core_install_py patch-ui4_wifisetupdialog_py patch-ui5_wifisetupdialog_py print/hplip/pkg: PLIST-hpijs Log message: Update to hplip-3.22.2.
Re: [UPDATE] lang/nim to 1.6.4
Volker Schlecht wrote:
>
>
> On 2/28/22 00:57, Omar Polo wrote:
>
> >> * I'm taking the gamble that the
> >> "slow machines can get a head of themselves and fail to link"
> >> comment is not valid anymore, using MAKE_JOBS for the parallelBuild
> >> parameter.
> >
> > I can't really comment on that. If it was set that way it was for a
> > reason, but IIRC until we add the DPB_PROPERTIES parallel to the port it
> > should still be built with one job on bulk machines, so...
>
> I'm sure it was for a reason, but the reason existed 6 years ago with
> version 0.11.2 ... I think it's worth checking if it's still around.
>
> > The point is not really to blindly use "-O2" instead of "-O3", but to
> > respect the CFLAGS from /etc/mk.conf (which are "-O2 -pipe" by default.)
> > The attached patch does that using SUBST_CMD to set the correct CFLAGS
> > in pre-configure. However this has the consequence (advantage?) that
> > all the executables built with nim will probably inherit the CFLAGS that
> > were set at build time, don't know if it's unwanted or not. There's
> > also the issue that now the "speed" and "size" cflags are actually the
> > same ^^
>
> I don't think we can get the nim compiler to universally respect CFLAGS
> from the shell environment. Having said that, the users who absolutely
> want -O3 back or enforce any other compiler flag, can later change their
> /etc/nim/nim.cfg
I wasn't trying to say that we should patch the nim compiler to always
respect $CFLAGS, but rather that it should respect $CFLAGS *during the
build*. My patch had the side-effect of persisting the build-time
$CFLAGS as default compiler flags for the generated package too (they
end up in /etc/nim/nim.cfg), which now I think it's probably a good
idea.
(the rationale is that the port infrastructure should be always able to
decide which CFLAGS to use and the port should respect that.)
> For the same reason however I now think it would be better not to touch
> the size optimization. It's not used in building the compiler, so it
> doesn't make a difference in the port, but it basically disables the
> whole optimization option.
Yes, the size flags are not actually used in the build of the compiler.
However, I'd still like for the $CFLAGS to be recorded in that case too,
so the patch below does
-clang.options.size = "-Os"
+clang.options.size = "${CFLAGS} -Os"
if in the future we need to tweak CFLAGS to make nim work (for e.g.
after a compiler update or because it needs some extra dependency that
needs extra flags to work) we shouldn't have any issue.
> > I've added some comments to the patches, the only thing I don't
> > understand is why comment useFork (I admit I haven't looked into what it
> > does)
>
> It uses fork instead of posix_spawn ... both OpenBSD and FreeBSD remove
> that line in their ports, though. NetBSD keeps it as it is.
>
> It was added by upstream 8 years ago, and the comment refers to
> posix_spawn being new to BSDs at the time.
>
> > I've also taken the chance to do some cosmethic changes to the makefile:
> >
> > - drop unused variable VERSION > - no need to ${INSTALL_PROGRAM_DIR}
> > ${PREFIX}/bin, it's already there
> > - group some common patterns in a .for loop
> >
> > Thoughts?
>
> Other than my point about the size optimization options in nim.cfg, this
> looks good to me!
so here's another try. I'm still keeping ${CFLAGS} in the size case but
leaving -Os afterwards; can remove that if deemed extreme.
Comments/OK/Thoughts?
Index: Makefile
===
RCS file: /home/cvs/ports/lang/nim/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile2 May 2020 09:33:06 - 1.11
+++ Makefile27 Feb 2022 23:33:05 -
@@ -2,25 +2,24 @@
ONLY_FOR_ARCHS = i386 amd64
-BROKEN-i386 = hardcodes gcc; see config/nim.cfg
-
COMMENT = statically typed, imperative programming language
-VERSION = 1.2.0
-DISTNAME = nim-${VERSION}
+DISTNAME = nim-1.6.4
EXTRACT_SUFX = .tar.xz
-REVISION = 0
CATEGORIES = lang
-HOMEPAGE = http://nim-lang.org/
-MASTER_SITES = http://nim-lang.org/download/ \
- https://download.tuxfamily.org/jod/lang/nim/
+HOMEPAGE = https://nim-lang.org/
+MASTER_SITES = https://nim-lang.org/download/
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB = c m
+WANTLIB = c m pthread
+
+MODULES = lang/python
+
+SUBST_VARS += CFLAGS
post-patch:
mkdir -p ${WRKSRC}/nimcache-port
@@ -29,26 +28,30 @@ post-patch:
perl -i -pe "s#NIM_PORT_CACHE#${WRKSRC}/nimcache-port-test#" \
${WRKSRC}/koch.nim
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/config/nim.cfg
+
do-build:
cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
+
NEW textproc/py-xmlschema and textproc/py-xmlschema
Please find enclosed a port for py-xmlschema, which is needed as TDEP for py-test. CATEGORY: textproc DESCR: The xmlschema library is an implementation of XML Schema for Python. Also enclosed is a port for py-elementpath, which is a RDEP of py-xmlschema. CATEGORY: textproc DESCR: The proposal of this package is to provide XPath 1.0 and 2.0 selectors for Python's ElementTree XML data structures, both for the standard ElementTree library and for the lxml.etree library. All tests of both ports pass. OK to import? py-xmlschema.tgz Description: application/tar-gz py-elementpath.tgz Description: application/tar-gz
FIX devel/py-test-6.2.5 DEPS
Recent update of py-test needs a couple of RDEPs to run properly. While
here update BDEP and TDEP. With the diff below one test fails, which I
do not fully understand. test.log enclosed for reference purposes.
Please note that textproc/py-xmlschema is needed, which is new, and will
be send in a separate mail to @ports.
OK?
diff --git Makefile Makefile
index ea8a66d176d..5a6c295ea9b 100644
--- Makefile
+++ Makefile
@@ -5,6 +5,7 @@ COMMENT = cross-project testing tool for Python
MODPY_EGG_VERSION =6.2.5
DISTNAME = pytest-${MODPY_EGG_VERSION}
PKGNAME = py-test-${MODPY_EGG_VERSION}
+REVISION = 0
CATEGORIES = devel
@@ -22,20 +23,24 @@ MODPY_PYTEST_ARGS = testing
FLAVORS = python3
FLAVOR = python3
-BUILD_DEPENDS =devel/py-setuptools_scm${MODPY_FLAVOR}
+BUILD_DEPENDS =devel/py-setuptools${MODPY_FLAVOR} \
+ devel/py-setuptools_scm${MODPY_FLAVOR}
RUN_DEPENDS = devel/py-atomicwrites${MODPY_FLAVOR} \
devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
- devel/py-more-itertools${MODPY_FLAVOR} \
devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
devel/py-py${MODPY_FLAVOR} \
- devel/py-setuptools${MODPY_FLAVOR}
+ sysutils/py-packaging${MODPY_FLAVOR} \
+ textproc/py-iniconfig${MODPY_FLAVOR} \
+ textproc/py-toml${MODPY_FLAVOR}
TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
+ devel/py-argcomplete${MODPY_FLAVOR} \
devel/py-hypothesis${MODPY_FLAVOR} \
devel/py-mock${MODPY_FLAVOR} \
devel/py-nose${MODPY_FLAVOR} \
+ www/py-requests${MODPY_FLAVOR} \
shells/bash \
- www/py-requests${MODPY_FLAVOR}
+ textproc/py-xmlschema${MODPY_FLAVOR}
.include
test.log.gz
Description: application/gunzip
