[update] audio/picard to 2.8.2
Hello,
Here's an update for picard up to 2.8.2. I've tested by rescanning my
library and updating tags, looks good.
changelog:
Bugfixes
PICARD-2480 - Lookup CD from EAC log generates incorrect Disc
ID from Enhanced CDs
PICARD-2498 - Except for the description no HTML should be
allowed in plugin metadata
PICARD-2505 - Cover art type "matrix/runout" causes a folder
"matrix" being created when saving cover art
PICARD-2506 - fpcalc errors out with paths > 259 characters
PICARD-2507 - CD pregap track not included in totaltracks
PICARD-2508 - Scripts being run repeatedly when script editor
is open, can result in data duplication for scripts appending
to existing tags
PICARD-2515 - macOS: Swatches not coloured in Options > User
Interface > Colours
PICARD-2518 - Keyboard shortcuts not working in Italian
localization
Improvements
PICARD-2504 - Increase default query limit and make it configurable
PICARD-2516 - Support CAA cover art types "Top" and "Bottom"
PICARD-2517 - Support media type "Mixed Mode CD"
Thanks,
Lucas
diff /usr/ports
commit - 1b00e00131b944bba2bd8a8b6c126fa42546a04e
path + /usr/ports
blob - d20e968435611baaac1594e2383a9113bccc84ee
file + audio/picard/Makefile
--- audio/picard/Makefile
+++ audio/picard/Makefile
@@ -1,6 +1,6 @@
COMMENT = automatic audio files tagger using the MusicBrainz database
-MODPY_EGG_VERSION =2.8.1
+MODPY_EGG_VERSION =2.8.2
DISTNAME = picard-${MODPY_EGG_VERSION}
CATEGORIES = audio
blob - 6ec2d57621ecb040baf3a48774e74f808fb35869
file + audio/picard/distinfo
--- audio/picard/distinfo
+++ audio/picard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (picard-2.8.1.tar.gz) = HXY+ICraMl7XE8HSFrsal7KhOtWxqBmCXvcCJInmcK0=
-SIZE (picard-2.8.1.tar.gz) = 4477639
+SHA256 (picard-2.8.2.tar.gz) = WnRM5+mxk3dcAPYHDfEh84gUVFXzyHuJKSTAzI0QW/I=
+SIZE (picard-2.8.2.tar.gz) = 4505107
回复: x11/lxqt: Update to 1.1.0
Hi,
Here is the revised patch for x11/lxqt, include:
i) Replace 1.1.0 with ${VERSION}
ii) Fix PLIST errors
ii) Add lxqt-archiver
Any comments ?
Cheers !
wen
发件人: Rafael Sadowski
发送时间: 2022年5月1日 22:53
收件人: wen heping
抄送: ports@openbsd.org
主题: Re: x11/lxqt: Update to 1.1.0
On Sun May 01, 2022 at 02:13:13PM +, wen heping wrote:
> Hi, ports@:
>
>Here is a patch for x11/lxqt to update to 1.1.0.
>It build well and run well on my amd64-7.1 system.
>
>Any comments?
We could replace:
+LIB_DEPENDS += x11/lxqt/liblxqt>=1.1.0
with
+LIB_DEPENDS += x11/lxqt/liblxqt>=${VERSION}
What do you think?
Rafael
? x11/lxqt/panel/patches/patch-panel-resources-panel-conf
Index: x11/lxqt/Makefile
===
RCS file: /cvs/ports/x11/lxqt/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- x11/lxqt/Makefile 11 Mar 2022 20:16:38 - 1.3
+++ x11/lxqt/Makefile 14 Jul 2022 23:56:20 -
@@ -9,6 +9,7 @@
# LXQt
SUBDIR += liblxqt
SUBDIR += about
+ SUBDIR += archiver
SUBDIR += config #NO KScreen
SUBDIR += globalkeys
SUBDIR += notificationd
Index: x11/lxqt/Makefile.inc
===
RCS file: /cvs/ports/x11/lxqt/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- x11/lxqt/Makefile.inc 11 Mar 2022 20:16:38 - 1.7
+++ x11/lxqt/Makefile.inc 14 Jul 2022 23:56:20 -
@@ -1,6 +1,6 @@
DIST_SUBDIR = lxqt
-VERSION ?= 1.0.0
+VERSION ?= 1.1.0
DISTNAME ?=${NAME}-${VERSION}
Index: x11/lxqt/about/Makefile
===
RCS file: /cvs/ports/x11/lxqt/about/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- x11/lxqt/about/Makefile 11 Mar 2022 20:16:38 - 1.8
+++ x11/lxqt/about/Makefile 14 Jul 2022 23:56:20 -
@@ -6,9 +6,9 @@ WANTLIB += ${COMPILER_LIBCXX} KF5WindowS
WANTLIB += Qt5Gui Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xdg Qt5XdgIconLoader
WANTLIB += Qt5Xml X11 c gio-2.0 glib-2.0 gobject-2.0 lxqt m
-LIB_DEPENDS += x11/lxqt/liblxqt>=1.0.0
+LIB_DEPENDS += x11/lxqt/liblxqt>=${VERSION}
-BUILD_DEPENDS += x11/lxqt/build-tools
+BUILD_DEPENDS += x11/lxqt/build-tools>=0.11.0
RUN_DEPENDS += devel/desktop-file-utils
Index: x11/lxqt/about/distinfo
===
RCS file: /cvs/ports/x11/lxqt/about/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- x11/lxqt/about/distinfo 22 Nov 2021 05:45:42 - 1.3
+++ x11/lxqt/about/distinfo 14 Jul 2022 23:56:20 -
@@ -1,2 +1,2 @@
-SHA256 (lxqt/lxqt-about-1.0.0.tar.xz) =
HBT2i/ZQmfvUawYv/GySZWYgqhqe7FoP0tGxGIiTkgM=
-SIZE (lxqt/lxqt-about-1.0.0.tar.xz) = 43176
+SHA256 (lxqt/lxqt-about-1.1.0.tar.xz) =
g1u8WORU2x/EY88/9lMmlRQApPn/W03osOo62+6CeA0=
+SIZE (lxqt/lxqt-about-1.1.0.tar.xz) = 45324
Index: x11/lxqt/about/pkg/PLIST
===
RCS file: /cvs/ports/x11/lxqt/about/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- x11/lxqt/about/pkg/PLIST11 Mar 2022 20:16:38 - 1.4
+++ x11/lxqt/about/pkg/PLIST14 Jul 2022 23:56:20 -
@@ -3,6 +3,7 @@
@bin bin/lxqt-about
share/applications/lxqt-about.desktop
@tag update-desktop-database
+share/icons/hicolor/scalable/apps/lxqt-about.svg
share/lxqt/translations/
share/lxqt/translations/lxqt-about/
share/lxqt/translations/lxqt-about/lxqt-about_ar.qm
@@ -26,6 +27,7 @@ share/lxqt/translations/lxqt-about/lxqt-
share/lxqt/translations/lxqt-about/lxqt-about_fr.qm
share/lxqt/translations/lxqt-about/lxqt-about_gl.qm
share/lxqt/translations/lxqt-about/lxqt-about_he.qm
+share/lxqt/translations/lxqt-about/lxqt-about_hi.qm
share/lxqt/translations/lxqt-about/lxqt-about_hr.qm
share/lxqt/translations/lxqt-about/lxqt-about_hu.qm
share/lxqt/translations/lxqt-about/lxqt-about_ia.qm
@@ -55,3 +57,4 @@ share/lxqt/translations/lxqt-about/lxqt-
share/lxqt/translations/lxqt-about/lxqt-about_vi.qm
share/lxqt/translations/lxqt-about/lxqt-about_zh_CN.qm
share/lxqt/translations/lxqt-about/lxqt-about_zh_TW.qm
+@tag gtk-update-icon-cache %D/share/icons/hicolor
Index: x11/lxqt/archiver/Makefile
===
RCS file: x11/lxqt/archiver/Makefile
diff -N x11/lxqt/archiver/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ x11/lxqt/archiver/Makefile 14 Jul 2022 23:56:20 -
@@ -0,0 +1,18 @@
+COMMENT = Qt file archiver
+VERSION= 0.6.0
+
+NAME = lxqt-archiver
+
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets Qt5X11Extras
+WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 m
+WANTLIB += gthread-2.0 intl json-glib-1.0 xcb
+
+LIB_DEPENDS += devel/json-glib \
+ x11/qt5/qtx11extras
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2022/07/14 14:53:23 Modified files: sysutils/trash-d: Makefile distinfo sysutils/trash-d/files: trash.1 Log message: Update to trash-d-18 Changelog: https://github.com/rushsteve1/trash-d/releases/tag/18
Re: devel/cmake: keep qt3/qt4 patches?
On Thu, Jul 14, 2022 at 09:49:17PM +0200, Rafael Sadowski wrote:
> On Thu Jul 14, 2022 at 07:03:46PM +, Klemens Nanni wrote:
> > Came to devel/cmake/patches/ to investigate behaviour I saw and was
> > surprised (again) by the amount of local changes we carry.
> >
> > We no longer package/support the old frameworks, so can these patches
> > go?
> >
> > I did not run into a problem with those patches, just wondering if we
> > can lower the maintainence burden.
>
> I had the same questions at the last updates, good to see someone else
> question and answer it with a diff.
>
> OK rsadowski
Thanks.
I missed FindKDE3.cmake, full diff here.
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- Makefile7 Jul 2022 16:23:17 - 1.212
+++ Makefile14 Jul 2022 18:58:30 -
@@ -6,7 +6,7 @@ VER = 3.23.2
EPOCH =0
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 1
+REVISION = 2
HOMEPAGE = https://www.cmake.org/
Index: patches/patch-Modules_FindKDE3_cmake
===
RCS file: patches/patch-Modules_FindKDE3_cmake
diff -N patches/patch-Modules_FindKDE3_cmake
--- patches/patch-Modules_FindKDE3_cmake11 Mar 2022 18:49:50 -
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-Index: Modules/FindKDE3.cmake
Modules/FindKDE3.cmake.orig
-+++ Modules/FindKDE3.cmake
-@@ -294,12 +294,6 @@ if(KDE3_FOUND)
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor
-Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W
-Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute
-fno-exceptions -fno-check-new -fno-common")
- endif ()
-
-- # if no special buildtype is selected, add -O2 as default optimization
-- if (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
--set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
--set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-- endif ()
--
- #set(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined
-Wl,--allow-shlib-undefined")
- #set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version
-Wl,--no-undefined -lc")
- #set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version
-Wl,--no-undefined -lc")
Index: patches/patch-Modules_FindQt3_cmake
===
RCS file: patches/patch-Modules_FindQt3_cmake
diff -N patches/patch-Modules_FindQt3_cmake
--- patches/patch-Modules_FindQt3_cmake 11 Mar 2022 18:49:50 - 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-Index: Modules/FindQt3.cmake
Modules/FindQt3.cmake.orig
-+++ Modules/FindQt3.cmake
-@@ -142,7 +142,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
-
- # Qt 3 should prefer QTDIR over the PATH
- find_program(QT_MOC_EXECUTABLE
-- NAMES moc-qt3 moc3 moc3-mt moc
-+ NAMES moc3 moc-qt3 moc3-mt moc
- HINTS
- ENV QTDIR
- PATHS
-@@ -162,7 +162,7 @@ endif()
-
- # Qt 3 should prefer QTDIR over the PATH
- find_program(QT_UIC_EXECUTABLE
-- NAMES uic-qt3 uic3 uic3-mt uic
-+ NAMES uic3 uic-qt3 uic3-mt uic
- HINTS
- ENV QTDIR
- PATHS
Index: patches/patch-Modules_FindQt4_cmake
===
RCS file: patches/patch-Modules_FindQt4_cmake
diff -N patches/patch-Modules_FindQt4_cmake
--- patches/patch-Modules_FindQt4_cmake 11 Mar 2022 18:49:50 - 1.32
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,50 +0,0 @@
-Index: Modules/FindQt4.cmake
Modules/FindQt4.cmake.orig
-+++ Modules/FindQt4.cmake
-@@ -518,7 +518,12 @@ endfunction()
-
- set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
-
--set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
-+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+ set(_QT4_QMAKE_NAMES qmake4)
-+else()
-+ set(_QT4_QMAKE_NAMES qmake4 qmake-qt4 qmake qmake-mac)
-+endif()
-+
- _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
-
- if (QT_QMAKE_EXECUTABLE AND
-@@ -694,6 +699,8 @@ if (QT_QMAKE_EXECUTABLE AND
-
- # Set QT_INCLUDES
- set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR})
-+ # Help QtOpenGL find GL/gl.h
-+ list(APPEND QT_INCLUDES "${X11BASE}/include")
-
-
- # ask qmake for the documentation directory
-@@ -1133,17 +1140,17 @@ if (QT_QMAKE_EXECUTABLE AND
- endif()
- endmacro()
-
-- _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
-- _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
-+ _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc4 moc-qt4 moc)
-+ _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic4 uic-qt4 uic)
- _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
- _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
- _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)
Re: devel/cmake: keep qt3/qt4 patches?
On Thu Jul 14, 2022 at 07:03:46PM +, Klemens Nanni wrote:
> Came to devel/cmake/patches/ to investigate behaviour I saw and was
> surprised (again) by the amount of local changes we carry.
>
> We no longer package/support the old frameworks, so can these patches
> go?
>
> I did not run into a problem with those patches, just wondering if we
> can lower the maintainence burden.
I had the same questions at the last updates, good to see someone else
question and answer it with a diff.
OK rsadowski
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/cmake/Makefile,v
> retrieving revision 1.212
> diff -u -p -r1.212 Makefile
> --- Makefile 7 Jul 2022 16:23:17 - 1.212
> +++ Makefile 14 Jul 2022 18:58:30 -
> @@ -6,7 +6,7 @@ VER = 3.23.2
> EPOCH = 0
> DISTNAME = cmake-${VER}
> CATEGORIES = devel
> -REVISION = 1
> +REVISION = 2
>
> HOMEPAGE = https://www.cmake.org/
>
> Index: patches/patch-Modules_FindQt3_cmake
> ===
> RCS file: patches/patch-Modules_FindQt3_cmake
> diff -N patches/patch-Modules_FindQt3_cmake
> --- patches/patch-Modules_FindQt3_cmake 11 Mar 2022 18:49:50 -
> 1.14
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,21 +0,0 @@
> -Index: Modules/FindQt3.cmake
> Modules/FindQt3.cmake.orig
> -+++ Modules/FindQt3.cmake
> -@@ -142,7 +142,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
> -
> - # Qt 3 should prefer QTDIR over the PATH
> - find_program(QT_MOC_EXECUTABLE
> -- NAMES moc-qt3 moc3 moc3-mt moc
> -+ NAMES moc3 moc-qt3 moc3-mt moc
> - HINTS
> - ENV QTDIR
> - PATHS
> -@@ -162,7 +162,7 @@ endif()
> -
> - # Qt 3 should prefer QTDIR over the PATH
> - find_program(QT_UIC_EXECUTABLE
> -- NAMES uic-qt3 uic3 uic3-mt uic
> -+ NAMES uic3 uic-qt3 uic3-mt uic
> - HINTS
> - ENV QTDIR
> - PATHS
> Index: patches/patch-Modules_FindQt4_cmake
> ===
> RCS file: patches/patch-Modules_FindQt4_cmake
> diff -N patches/patch-Modules_FindQt4_cmake
> --- patches/patch-Modules_FindQt4_cmake 11 Mar 2022 18:49:50 -
> 1.32
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,50 +0,0 @@
> -Index: Modules/FindQt4.cmake
> Modules/FindQt4.cmake.orig
> -+++ Modules/FindQt4.cmake
> -@@ -518,7 +518,12 @@ endfunction()
> -
> - set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
> -
> --set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
> -+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
> -+ set(_QT4_QMAKE_NAMES qmake4)
> -+else()
> -+ set(_QT4_QMAKE_NAMES qmake4 qmake-qt4 qmake qmake-mac)
> -+endif()
> -+
> - _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
> -
> - if (QT_QMAKE_EXECUTABLE AND
> -@@ -694,6 +699,8 @@ if (QT_QMAKE_EXECUTABLE AND
> -
> - # Set QT_INCLUDES
> - set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR}
> ${QT_QTCORE_INCLUDE_DIR})
> -+ # Help QtOpenGL find GL/gl.h
> -+ list(APPEND QT_INCLUDES "${X11BASE}/include")
> -
> -
> - # ask qmake for the documentation directory
> -@@ -1133,17 +1140,17 @@ if (QT_QMAKE_EXECUTABLE AND
> - endif()
> - endmacro()
> -
> -- _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
> -- _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
> -+ _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc4 moc-qt4 moc)
> -+ _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic4 uic-qt4 uic)
> - _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
> - _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
> - _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml
> qdbuscpp2xml)
> - _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp
> qdbusxml2cpp)
> -- _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4
> lupdate)
> -- _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4
> lrelease4 lrelease)
> -+ _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate4 lupdate-qt4
> lupdate)
> -+ _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease4
> lrelease-qt4 lrelease)
> - _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE
> Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)
> -- _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4
> designer4 designer)
> -- _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4
> linguist4 linguist)
> -+ _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer4
> designer-qt4 designer)
> -+ _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist4
> linguist-qt4 linguist)
> -
> - if (NOT TARGET Qt4::qmake)
> - add_executable(Qt4::qmake IMPORTED)
> Index: patches/patch-Modules_FindQt_cmake
> ===
> RCS file: patches/patch-Modules_FindQt_cmake
> diff -N
Re: idea: allow side-local port-specific config
On Thu, Jul 14, 2022 at 08:22:54PM +0200, Christian Weisgerber wrote: > Klemens Nanni: > > > Here's something I currently do to ports-framework changes I need on the > > machine I work on from actual port changes that ought to be committed. > > I use this on the bulk building machines: > > $ cat /etc/mk.conf > .if exists(/usr/ports/infrastructure/mk/site.mk) > .include "/usr/ports/infrastructure/mk/site.mk" > .endif > > I guess I could use -include. > > Anyway, that's simple enough. Do we need yet more magic in > bsd.port.mk? Since I don't have any drawbacks at hand, mk.conf(5) seems to be the simpler place for now. I'll keep using that and report back in case there's any change in behaviour.
Re: UPDATE: java/gradle
On Thu Jul 14, 2022 at 06:25:44PM +0200, Omar Polo wrote: > Theo Buehler wrote: > > Please keep replies on list > > > > On Wed, Jul 13, 2022 at 10:46:23PM -0500, Matthew Martin wrote: > > > On Thu, Jul 14, 2022 at 05:30:44AM +0200, Theo Buehler wrote: > > > > On Fri, Jul 08, 2022 at 09:54:40AM +0200, Omar Polo wrote: > > > > > Rafael Sadowski wrote: > > > > > > Update gradle to 7.4.2. OK? > > > > > > > > > > briefly tested, but seems to work fine. ok for me, thanks! > > > > > > > > > > > > > In my latest bulk, security/ghidra failed to build. Is this related to > > > > this update? > > yep. when testing the gradle update i failed to notice that ghidra uses > gradle to build (typoed something in show-reverse-deps probably), sorry! Me too! > > > > > FAILURE: Build failed with an exception. > > > > > > > > * Where: > > > > Script > > > > '/tmp/pobj/ghidra-9.1.2/ghidra-Ghidra_9.1.2_build/gradle/helpProject.gradle' > > > > line: 47 > > > > > > > > * What went wrong: > > > > A problem occurred evaluating script. > > > > > Could not find method helpIndexCompile() for arguments > > > > > [javax.help:javahelp:2.0.05] on object of type > > > > > org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler. > > > > > > I suspect you'll need something like > > > https://github.com/NationalSecurityAgency/ghidra/commit/3a0ae8ee39a08277c623dc954560e343c7efe3d9#diff-9d6939fff317ec2b32527c6739a880db1b3b78a2159b23e75dce26f17edbf682 > > correct, but not really that easy. The gradle files in the version > we're packaging and the one from that commit diverged quite a bit. > Furthermore, since upstream closed the pr for the OpenBSD support[0] > it's not simple updating to a newer version. > > [0]: https://github.com/NationalSecurityAgency/ghidra/pull/490 > > if it helps someone, here's where I'm stuck; i've backported most of the > changes to build with the updated gradle, but now fails because of: > > FAILURE: Build failed with an exception. > > * Where: > Build file > '/home/_pobj/ghidra-9.1.2/ghidra-Ghidra_9.1.2_build/build.gradle' line: 316 > > * What went wrong: > Failed to notify task execution graph listener. > > Could not get unknown property 'runtime' for configuration container > of type > org.gradle.api.internal.artifacts.configurations.DefaultConfigurationContainer. > > Could not get unknown property 'runtime' for configuration container > of type > org.gradle.api.internal.artifacts.configurations.DefaultConfigurationContainer. > ... > > and zero ideas on how to fix it. > I tried to update ghidra to 10 with no luck. This update needs more effort. I would suggest we go back: diff --git a/java/gradle/Makefile b/java/gradle/Makefile index b5f4c071271..e08bf281b94 100644 --- a/java/gradle/Makefile +++ b/java/gradle/Makefile @@ -1,7 +1,8 @@ COMMENT = build automation tool -DISTNAME = gradle-7.4.2 +DISTNAME = gradle-6.7 EXTRACT_SUFX = -bin.zip +EPOCH =0 CATEGORIES = java diff --git a/java/gradle/distinfo b/java/gradle/distinfo index fb3a6a3b91d..d7c3fd3837f 100644 --- a/java/gradle/distinfo +++ b/java/gradle/distinfo @@ -1,2 +1,2 @@ -SHA256 (gradle-7.4.2-bin.zip) = KeSbEJhOWF2BGLfQvEUvlE44ZFjfJzcbSbSsHexLf9o= -SIZE (gradle-7.4.2-bin.zip) = 115852617 +SHA256 (gradle-6.7-bin.zip) = itV3WQGakjPcfcTRpTDO/hCdwSIADVf35iP4z0up38Q= +SIZE (gradle-6.7-bin.zip) = 102804263 diff --git a/java/gradle/patches/patch-bin_gradle b/java/gradle/patches/patch-bin_gradle index 8a20d569a87..767e2a11cc5 100644 --- a/java/gradle/patches/patch-bin_gradle +++ b/java/gradle/patches/patch-bin_gradle @@ -1,8 +1,8 @@ Index: bin/gradle --- bin/gradle.orig +++ bin/gradle -@@ -117,6 +117,8 @@ esac - CLASSPATH=$APP_HOME/lib/gradle-launcher-7.4.2.jar +@@ -83,6 +83,8 @@ esac + CLASSPATH=$APP_HOME/lib/gradle-launcher-6.6.jar +JAVA_HOME="$(javaPathHelper -h gradle)" diff --git a/java/gradle/pkg/PLIST b/java/gradle/pkg/PLIST index 957895e2199..ab876647759 100644 --- a/java/gradle/pkg/PLIST +++ b/java/gradle/pkg/PLIST @@ -10,30 +10,26 @@ share/java/gradle/bin/gradle.bat share/java/gradle/init.d/ share/java/gradle/init.d/readme.txt share/java/gradle/lib/ -share/java/gradle/lib/annotations-20.1.0.jar -share/java/gradle/lib/ant-1.10.11.jar -share/java/gradle/lib/ant-antlr-1.10.11.jar -share/java/gradle/lib/ant-junit-1.10.11.jar -share/java/gradle/lib/ant-launcher-1.10.11.jar -share/java/gradle/lib/antlr4-runtime-4.7.2.jar -share/java/gradle/lib/asm-9.2.jar -share/java/gradle/lib/asm-analysis-9.2.jar -share/java/gradle/lib/asm-commons-9.2.jar -share/java/gradle/lib/asm-tree-9.2.jar -share/java/gradle/lib/commons-compress-1.21.jar +share/java/gradle/lib/annotations-13.0.jar +share/java/gradle/lib/ant-1.10.8.jar +share/java/gradle/lib/ant-launcher-1.10.8.jar +share/java/gradle/lib/asm-7.3.1.jar +share/java/gradle/lib/asm-analysis-7.3.1.jar +share/java/gradle/lib/asm-commons-7.3.1.jar +share/java/gradle/lib/asm-tree-7.3.1.jar
devel/cmake: keep qt3/qt4 patches?
Came to devel/cmake/patches/ to investigate behaviour I saw and was
surprised (again) by the amount of local changes we carry.
We no longer package/support the old frameworks, so can these patches
go?
I did not run into a problem with those patches, just wondering if we
can lower the maintainence burden.
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- Makefile7 Jul 2022 16:23:17 - 1.212
+++ Makefile14 Jul 2022 18:58:30 -
@@ -6,7 +6,7 @@ VER = 3.23.2
EPOCH =0
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 1
+REVISION = 2
HOMEPAGE = https://www.cmake.org/
Index: patches/patch-Modules_FindQt3_cmake
===
RCS file: patches/patch-Modules_FindQt3_cmake
diff -N patches/patch-Modules_FindQt3_cmake
--- patches/patch-Modules_FindQt3_cmake 11 Mar 2022 18:49:50 - 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-Index: Modules/FindQt3.cmake
Modules/FindQt3.cmake.orig
-+++ Modules/FindQt3.cmake
-@@ -142,7 +142,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
-
- # Qt 3 should prefer QTDIR over the PATH
- find_program(QT_MOC_EXECUTABLE
-- NAMES moc-qt3 moc3 moc3-mt moc
-+ NAMES moc3 moc-qt3 moc3-mt moc
- HINTS
- ENV QTDIR
- PATHS
-@@ -162,7 +162,7 @@ endif()
-
- # Qt 3 should prefer QTDIR over the PATH
- find_program(QT_UIC_EXECUTABLE
-- NAMES uic-qt3 uic3 uic3-mt uic
-+ NAMES uic3 uic-qt3 uic3-mt uic
- HINTS
- ENV QTDIR
- PATHS
Index: patches/patch-Modules_FindQt4_cmake
===
RCS file: patches/patch-Modules_FindQt4_cmake
diff -N patches/patch-Modules_FindQt4_cmake
--- patches/patch-Modules_FindQt4_cmake 11 Mar 2022 18:49:50 - 1.32
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,50 +0,0 @@
-Index: Modules/FindQt4.cmake
Modules/FindQt4.cmake.orig
-+++ Modules/FindQt4.cmake
-@@ -518,7 +518,12 @@ endfunction()
-
- set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
-
--set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
-+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+ set(_QT4_QMAKE_NAMES qmake4)
-+else()
-+ set(_QT4_QMAKE_NAMES qmake4 qmake-qt4 qmake qmake-mac)
-+endif()
-+
- _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
-
- if (QT_QMAKE_EXECUTABLE AND
-@@ -694,6 +699,8 @@ if (QT_QMAKE_EXECUTABLE AND
-
- # Set QT_INCLUDES
- set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR})
-+ # Help QtOpenGL find GL/gl.h
-+ list(APPEND QT_INCLUDES "${X11BASE}/include")
-
-
- # ask qmake for the documentation directory
-@@ -1133,17 +1140,17 @@ if (QT_QMAKE_EXECUTABLE AND
- endif()
- endmacro()
-
-- _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
-- _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
-+ _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc4 moc-qt4 moc)
-+ _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic4 uic-qt4 uic)
- _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
- _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
- _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)
- _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp)
-- _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4
lupdate)
-- _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4
lrelease4 lrelease)
-+ _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate4 lupdate-qt4
lupdate)
-+ _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease4
lrelease-qt4 lrelease)
- _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE
Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)
-- _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4
designer4 designer)
-- _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4
linguist4 linguist)
-+ _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer4
designer-qt4 designer)
-+ _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist4
linguist-qt4 linguist)
-
- if (NOT TARGET Qt4::qmake)
- add_executable(Qt4::qmake IMPORTED)
Index: patches/patch-Modules_FindQt_cmake
===
RCS file: patches/patch-Modules_FindQt_cmake
diff -N patches/patch-Modules_FindQt_cmake
--- patches/patch-Modules_FindQt_cmake 11 Mar 2022 18:49:50 - 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-Index: Modules/FindQt.cmake
Modules/FindQt.cmake.orig
-+++ Modules/FindQt.cmake
-@@ -43,6 +43,12 @@ if(_findqt_testing)
- endif()
-
- # look for signs of qt3 installations
-+file(GLOB GLOB_TEMP_VAR ${LOCALBASE}/lib/qt3/bin/qmake)
-+if(GLOB_TEMP_VAR)
-+ set(QT3_INSTALLED TRUE)
-+endif()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2022/07/14 12:43:44 Modified files: devel/p5-File-MimeInfo: Makefile distinfo Removed files: devel/p5-File-MimeInfo/patches: patch-t_06_pod_ok_t Log message: update p5-p5-File-MimeInfo to 0.33 from wen heping; OK kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2022/07/14 12:41:58 Modified files: audio/mpg123 : Makefile distinfo Log message: audio/mpg123: update to 1.30.1
Re: [update] samba-4.16.2
On Thu, Jul 14 2022, Jeremie Courreges-Anglas wrote:
> On Thu, Jul 14 2022, Jeremie Courreges-Anglas wrote:
>> Work around the build error I had by building --without-gettext.
>> (hint from upstream: https://bugzilla.samba.org/show_bug.cgi?id=15030)
>> I don't know whether this could have a negative impact.
>>
>> libreplace.so and libutil-setid.so are not versioned any more so
>> the -util package makes less sense. I deciced to just merge -util, -ldb
>> and -tevent in samba (nothing else uses those libs in a standalone
>> context anyway). The @conflict and @pkgpath markers seem ok, pkg_add -u
>> path tested. Overall, this looks like an nice simplification.
>>
>> Runtime completely untested, feedback and oks welcome. I've tossed this
>> in a bulk build, I'm not sure how much time I'll have to wait...
>
> Well bket@ (thanks!) was faster than my bulk build:
>this update depends
> on additional updates for databases/tdb and devel/libtalloc, said
> updates were not in the original diff.
should read:
this update depends on an additional update for databases/tdb only.
There's a devel/libtalloc update available upstream, but the version
bundled in net/samba is talloc-2.3.3, ie what we have in -current.
Here's an updated diff with a tweak from bket@ to adjust the tdb version
required in net/samba (useful if you already have tdb-1.4.5 installed).
Index: databases/tdb/Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- databases/tdb/Makefile 11 Mar 2022 18:31:47 - 1.41
+++ databases/tdb/Makefile 14 Jul 2022 18:25:04 -
@@ -2,11 +2,10 @@ COMMENT-main= trivial database library
COMMENT-python=Python ${MODPY_VERSION} bindings for tdb
# Keep in sync with the version bundled in net/samba
-V= 1.4.5
+V= 1.4.6
DISTNAME= tdb-$V
PKGNAME-python=py3-${DISTNAME}
-REVISION-python= 0
MULTI_PACKAGES=-main -python
Index: databases/tdb/distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- databases/tdb/distinfo 19 Oct 2021 12:06:57 - 1.17
+++ databases/tdb/distinfo 14 Jul 2022 18:25:04 -
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.5.tar.gz) = vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE=
-SIZE (tdb-1.4.5.tar.gz) = 729650
+SHA256 (tdb-1.4.6.tar.gz) = 1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws=
+SIZE (tdb-1.4.6.tar.gz) = 736747
Index: databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
===
RCS file:
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.10
diff -u -p -r1.10 patch-buildtools_wafsamba_wafsamba_py
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 11 Mar 2022
18:31:47 - 1.10
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 14 Jul 2022
18:25:04 -
@@ -4,7 +4,7 @@
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -211,6 +211,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -281,6 +281,13 @@ def SAMBA_LIBRARY(bld, libname, source,
realname = bld.map_shlib_extension(realname,
python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name,
python=(target_type=='PYTHON'))
@@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py
# we don't want any public libraries without version numbers
if (not private_library and target_type != 'PYTHON' and not realname):
if vnum is None and soname is None:
-@@ -322,9 +329,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -398,9 +405,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
if pyembed:
Index: net/samba/Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.313
diff -u -p -r1.313 Makefile
--- net/samba/Makefile 1 Jul 2022 08:39:59 - 1.313
+++ net/samba/Makefile 14 Jul 2022 18:25:04 -
@@ -1,61 +1,37 @@
-VERSION = 4.15.8
+VERSION = 4.16.2
DISTNAME = samba-${VERSION}
EPOCH =0
-REVISION-tevent = 6
COMMENT-main = SMB and CIFS client and server for UNIX
-COMMENT-ldb = LDAP-like embedded database
-COMMENT-tevent = event system based on talloc
-COMMENT-util = common libraries for Samba suite
COMMENT-docs = additional documentation and examples for Samba
PKGNAME-main = ${PKGNAME}
-PKGNAME-ldb = ldb-${LDB_V}
-PKGNAME-tevent = tevent-${TEVENT_V}
-PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
PKG_ARCH-docs =
Re: idea: allow side-local port-specific config
Klemens Nanni: > Here's something I currently do to ports-framework changes I need on the > machine I work on from actual port changes that ought to be committed. I use this on the bulk building machines: $ cat /etc/mk.conf .if exists(/usr/ports/infrastructure/mk/site.mk) .include "/usr/ports/infrastructure/mk/site.mk" .endif I guess I could use -include. Anyway, that's simple enough. Do we need yet more magic in bsd.port.mk? -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [update] samba-4.16.2
On Thu, Jul 14 2022, Jeremie Courreges-Anglas wrote:
> Work around the build error I had by building --without-gettext.
> (hint from upstream: https://bugzilla.samba.org/show_bug.cgi?id=15030)
> I don't know whether this could have a negative impact.
>
> libreplace.so and libutil-setid.so are not versioned any more so
> the -util package makes less sense. I deciced to just merge -util, -ldb
> and -tevent in samba (nothing else uses those libs in a standalone
> context anyway). The @conflict and @pkgpath markers seem ok, pkg_add -u
> path tested. Overall, this looks like an nice simplification.
>
> Runtime completely untested, feedback and oks welcome. I've tossed this
> in a bulk build, I'm not sure how much time I'll have to wait...
Well bket@ (thanks!) was faster than my bulk build: this update depends
on additional updates for databases/tdb and devel/libtalloc, said
updates were not in the original diff.
Updated diff below.
Index: databases/tdb/Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- databases/tdb/Makefile 11 Mar 2022 18:31:47 - 1.41
+++ databases/tdb/Makefile 14 Jul 2022 17:36:56 -
@@ -2,11 +2,10 @@ COMMENT-main= trivial database library
COMMENT-python=Python ${MODPY_VERSION} bindings for tdb
# Keep in sync with the version bundled in net/samba
-V= 1.4.5
+V= 1.4.6
DISTNAME= tdb-$V
PKGNAME-python=py3-${DISTNAME}
-REVISION-python= 0
MULTI_PACKAGES=-main -python
Index: databases/tdb/distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- databases/tdb/distinfo 19 Oct 2021 12:06:57 - 1.17
+++ databases/tdb/distinfo 14 Jul 2022 17:36:56 -
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.5.tar.gz) = vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE=
-SIZE (tdb-1.4.5.tar.gz) = 729650
+SHA256 (tdb-1.4.6.tar.gz) = 1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws=
+SIZE (tdb-1.4.6.tar.gz) = 736747
Index: databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
===
RCS file:
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.10
diff -u -p -r1.10 patch-buildtools_wafsamba_wafsamba_py
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 11 Mar 2022
18:31:47 - 1.10
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 14 Jul 2022
17:36:56 -
@@ -4,7 +4,7 @@
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -211,6 +211,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -281,6 +281,13 @@ def SAMBA_LIBRARY(bld, libname, source,
realname = bld.map_shlib_extension(realname,
python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name,
python=(target_type=='PYTHON'))
@@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py
# we don't want any public libraries without version numbers
if (not private_library and target_type != 'PYTHON' and not realname):
if vnum is None and soname is None:
-@@ -322,9 +329,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -398,9 +405,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
if pyembed:
Index: net/samba/Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.313
diff -u -p -r1.313 Makefile
--- net/samba/Makefile 1 Jul 2022 08:39:59 - 1.313
+++ net/samba/Makefile 14 Jul 2022 17:36:56 -
@@ -1,61 +1,37 @@
-VERSION = 4.15.8
+VERSION = 4.16.2
DISTNAME = samba-${VERSION}
EPOCH =0
-REVISION-tevent = 6
COMMENT-main = SMB and CIFS client and server for UNIX
-COMMENT-ldb = LDAP-like embedded database
-COMMENT-tevent = event system based on talloc
-COMMENT-util = common libraries for Samba suite
COMMENT-docs = additional documentation and examples for Samba
PKGNAME-main = ${PKGNAME}
-PKGNAME-ldb = ldb-${LDB_V}
-PKGNAME-tevent = tevent-${TEVENT_V}
-PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
PKG_ARCH-docs =*
-LDB_V =2.4.3
-TEVENT_V = 0.11.0
-
-SHARED_LIBS = asn1-samba4 2.0 \
- com_err-samba4 1.0 \
- dcerpc 1.1 \
+SHARED_LIBS = dcerpc 1.1 \
dcerpc-binding 4.0 \
dcerpc-samr 1.0 \
-
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/07/14 10:55:04 Modified files: sysutils/rclone: Makefile distinfo Log message: Update to rclone-1.59.0 Changelog can be found at https://rclone.org/changelog/
Re: UPDATE: java/gradle
Theo Buehler wrote:
> Please keep replies on list
>
> On Wed, Jul 13, 2022 at 10:46:23PM -0500, Matthew Martin wrote:
> > On Thu, Jul 14, 2022 at 05:30:44AM +0200, Theo Buehler wrote:
> > > On Fri, Jul 08, 2022 at 09:54:40AM +0200, Omar Polo wrote:
> > > > Rafael Sadowski wrote:
> > > > > Update gradle to 7.4.2. OK?
> > > >
> > > > briefly tested, but seems to work fine. ok for me, thanks!
> > > >
> > >
> > > In my latest bulk, security/ghidra failed to build. Is this related to
> > > this update?
yep. when testing the gradle update i failed to notice that ghidra uses
gradle to build (typoed something in show-reverse-deps probably), sorry!
> > > FAILURE: Build failed with an exception.
> > >
> > > * Where:
> > > Script
> > > '/tmp/pobj/ghidra-9.1.2/ghidra-Ghidra_9.1.2_build/gradle/helpProject.gradle'
> > > line: 47
> > >
> > > * What went wrong:
> > > A problem occurred evaluating script.
> > > > Could not find method helpIndexCompile() for arguments
> > > > [javax.help:javahelp:2.0.05] on object of type
> > > > org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.
> >
> > I suspect you'll need something like
> > https://github.com/NationalSecurityAgency/ghidra/commit/3a0ae8ee39a08277c623dc954560e343c7efe3d9#diff-9d6939fff317ec2b32527c6739a880db1b3b78a2159b23e75dce26f17edbf682
correct, but not really that easy. The gradle files in the version
we're packaging and the one from that commit diverged quite a bit.
Furthermore, since upstream closed the pr for the OpenBSD support[0]
it's not simple updating to a newer version.
[0]: https://github.com/NationalSecurityAgency/ghidra/pull/490
if it helps someone, here's where I'm stuck; i've backported most of the
changes to build with the updated gradle, but now fails because of:
FAILURE: Build failed with an exception.
* Where:
Build file
'/home/_pobj/ghidra-9.1.2/ghidra-Ghidra_9.1.2_build/build.gradle' line: 316
* What went wrong:
Failed to notify task execution graph listener.
> Could not get unknown property 'runtime' for configuration container
of type
org.gradle.api.internal.artifacts.configurations.DefaultConfigurationContainer.
> Could not get unknown property 'runtime' for configuration container
of type
org.gradle.api.internal.artifacts.configurations.DefaultConfigurationContainer.
...
and zero ideas on how to fix it.
Index: patches/patch-GPL_DMG_build_gradle
===
RCS file: patches/patch-GPL_DMG_build_gradle
diff -N patches/patch-GPL_DMG_build_gradle
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-GPL_DMG_build_gradle 14 Jul 2022 15:03:38 -
@@ -0,0 +1,39 @@
+backport (partial) of "GP-849: Gradle 7 support"
+https://github.com/NationalSecurityAgency/ghidra/commit/3a0ae8ee39a08277c623dc954560e343c7efe3d9#diff-9d6939fff317ec2b32527c6739a880db1b3b78a2159b23e75dce26f17edbf682
+
+Index: GPL/DMG/build.gradle
+--- GPL/DMG/build.gradle.orig
GPL/DMG/build.gradle
+@@ -13,7 +13,7 @@ if (findProject(':Generic') != null) {
+ }
+ }
+ else {
+- apply plugin: 'java'
++ apply plugin: 'java-library'
+ }
+ apply plugin: 'eclipse'
+
+@@ -36,12 +36,10 @@ sourceSets {
+ }
+ }
+
+-eclipse.classpath.plusConfigurations += [configurations.dmgCompile]
+-
+ dependencies {
+- dmgCompile ':csframework@jar'
+- dmgCompile ':hfsx@jar'
+- dmgCompile ':hfsx_dmglib@jar'
++ dmgImplementation ':csframework@jar'
++ dmgImplementation ':hfsx@jar'
++ dmgImplementation ':hfsx_dmglib@jar'
+ }
+
+
/***
+@@ -51,6 +49,6 @@ dependencies {
+
***/
+
+ jar {
+- destinationDir = file("build/data/lib")
++ destinationDirectory = file("build/data/lib")
+ from sourceSets.dmg.output
+ }
Index: patches/patch-GPL_nativeBuildProperties_gradle
===
RCS file:
/home/cvs/ports/security/ghidra/patches/patch-GPL_nativeBuildProperties_gradle,v
retrieving revision 1.4
diff -u -p -r1.4 patch-GPL_nativeBuildProperties_gradle
--- patches/patch-GPL_nativeBuildProperties_gradle 11 Mar 2022 19:53:24
- 1.4
+++ patches/patch-GPL_nativeBuildProperties_gradle 14 Jul 2022 15:12:48
-
@@ -19,8 +19,8 @@ Index: GPL/nativeBuildProperties.gradle
+ // Force use of Clang
+ clang(Clang) {
+ eachPlatform { tools ->
-+ tools.cppCompiler.executable = "${CXX}"
-+ tools.linker.executable = "${CXX}"
++ tools.cppCompiler.executable = "c++"
++ tools.linker.executable = "c++"
+ println "C++ compiler is
[${tools.cppCompiler.executable}]"
+ println "Linker is
[new] plan9/tslclient
Hello, I would like to include a package for a collection of 9front adjacent tools I have been working on. Currently the port includes the following: * a port of 9front tlsclient(1) that doubles as a rcpu(1). * login_-dp9ik auth program * git-remote-hjgit, for working with Ori's hjgit protocol for git9 To provide a bit of context, most of the code used in tlsclient is borrowed in some capacity from drawterm. The main difference is that tlsclient removes the 'kernel in userspace' portions of drawterm, making it much easier to use as building blocks for individual applications of the dp9ik code. The source is kept at https://git.sr.ht/~moody/tlsclient and I have attached a tar ball for the port files. This is my first whack at building an openbsd port, so let me know what I missed. Thanks, moody tlsclient.tgz Description: application/gzip
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Mon Jul 11 16:31:22 MDT 2022 Finished: Thu Jul 14 08:52:08 MDT 2022 Duration: 2 Days 16 hours 21 minutes Built using OpenBSD 7.1-current (GENERIC.MP) #1371: Sun Jul 10 12:41:10 MDT 2022 Built 9253 packages Number of packages built each day: Jul 11: 4786 Jul 12: 3325 Jul 13: 1114 Jul 14: 28 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2022-07-11/summary.log Build failures: 35 http://build-failures.rhaalovely.net/sparc64/2022-07-11/cad/dxf2gcode.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/cad/oce.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/comms/gammu.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/databases/recoll.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/avr/gcc.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/json-c.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/kf5/kio.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/qcoro.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/riscv32-esp-elf/binutils.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/xsd.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/xtensa-esp32-elf/binutils.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/xtensa-esp32s2-elf/binutils.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/xtensa-esp32s3-elf/binutils.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/devel/xtensa-lx106-elf/binutils.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/games/arx-libertatis.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/games/gargoyle.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/games/libgdx/1.9.11.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/graphics/birdfont.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/graphics/freeimage.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/graphics/makehuman.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/graphics/opencolorio.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/mail/postfix/snapshot.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/mail/postfix/stable.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/math/arpack.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/misc/open62541.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/multimedia/mkvtoolnix.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/security/keepassxc,yubikey.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/security/veracrypt.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/telephony/baresip/re.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/textproc/libmarisa.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/www/unit/unit-ruby.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/x11/gnome/gjs.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/x11/gnome/secrets.log http://build-failures.rhaalovely.net/sparc64/2022-07-11/x11/qt6/qtdeclarative.log Recurrent failures: failures/comms/gammu.log failures/databases/recoll.log failures/devel/avr/gcc.log failures/devel/kf5/kio.log failures/devel/qcoro.log failures/devel/riscv32-esp-elf/binutils.log failures/devel/xtensa-lx106-elf/binutils.log failures/games/arx-libertatis.log failures/games/gargoyle.log failures/graphics/birdfont.log failures/graphics/makehuman.log failures/graphics/opencolorio.log failures/mail/postfix/snapshot.log failures/mail/postfix/stable.log failures/math/arpack.log failures/misc/open62541.log failures/multimedia/mkvtoolnix.log failures/productivity/gnucash.log failures/security/keepassxc,yubikey.log failures/security/veracrypt.log New failures: +failures/devel/json-c.log +failures/games/libgdx/1.9.11.log +failures/graphics/freeimage.log Resolved failures: -failures/geo/pdal.log -failures/graphics/pstoedit.log -failures/inputmethods/libime.log -failures/security/clamav.log Packages newly built: +graphics/pstoedit +security/py-duo_universal,python3 +sysutils/vorta +www/civetweb Packages not built this time: -audio/pianobar -benchmarks/netperf-wrapper,,-gui -devel/droplet -devel/json-c -devel/ruby-bundler -devel/ruby-minitest -devel/ruby-minitest,ruby31 -editors/poke -emulators/emulationstation -games/libgdx/1.9.11 -geo/gdal -geo/gdal,-main -geo/gdal,-python -geo/gdal,python3 -geo/gdal,python3,-main -geo/gdal,python3,-python -geo/libosmium -geo/mapcache -geo/mapserver -geo/mapserver, -geo/mapserver,,-main -geo/mapserver,,-perl -geo/mapserver,,-php -geo/mapserver,,-python -geo/mapserver,,-utils -geo/mapserver,-main -geo/mapserver,-perl -geo/mapserver,-php -geo/mapserver,-python -geo/mapserver,-utils -geo/mdal -geo/merkaartor -geo/osm2pgrouting -geo/osm2pgsql -geo/pgrouting
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/07/14 08:44:50 Modified files: net/tg_owt : Makefile distinfo Log message: Replace EXTRACT_CASES for submodules with simpler post-extract symlinks No need to manually extract, rename and change the path on the fly; just leave extraction to bsd.port.mk and symlink the directory. No code change.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/07/14 08:02:41 Modified files: net/tg_owt : Makefile distinfo Log message: Use DIST_SUBDIR rather than prefixing every fetched patch While here, add license marker for the recently added crc32 bundle and link anoher pending upstream PR. No code change.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: flor...@cvs.openbsd.org 2022/07/14 07:47:42 Modified files: sysutils/salt : Makefile distinfo Log message: update to 3003.5 to make it work with py3-jinja2 >= 3.1 OK robert
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/14 05:05:26 Modified files: devel/got : Makefile distinfo Log message: update to got 0.74 - cast printf argument of type time_t to long long to match the %lld (naddy) - add missing revoked_signers grammar to got.conf(5) (jrick) - move 'got init' command to 'gotadmin init' - regress test SSH key revocations (jrick) - long overdue update of AUTHORS lists in man pages - add signer_id option to got.conf(5) (jrick) - delta_cache.c needs to include ; unbreaks -portable build on ubuntu - regress: use bs=1M for dd, not bs=1m; fixes -portable test failure on ubuntu - fix buf_alloca error handling (op) - some privsep.c refactoring and cleanup (op) - tog: implement global 'S' key map to switch split mode (jamsek) - tog: implement +/- keymaps to resize the focussed split (jamsek) - make 'tog log' error out in shallow Git repositories instead of hanging - tog: enable moving to prev/next blame line in diff view (jamsek) - improve documentation of the histedit 'mesg' command - histedit script: allow mesg command only after pick or edit commands (op) - for linux, fix usage of pipe(2) during SSH signing and verification (jrick)
Re: RStudio: keep in sync with R
On Thu, Jul 14, 2022 at 02:04:20AM +, Brian Callahan wrote:
> On 7/13/2022 3:08 PM, Theo Buehler wrote:
> > On Wed, Jul 13, 2022 at 09:03:32PM +0200, Rafael Sadowski wrote:
> >> On Tue Jul 12, 2022 at 04:23:22PM +0100, Zé Loff wrote:
> >>>
> >>> Hi Brian
> >>>
> >>> Due to R's bump of libR, RStudio's port needs tweaking.
> >>> Patch attached.
> >>>
> >>> Thanks
> >>> Zé
> >>>
> >>> --
> >>>
> >>
> >>> Index: patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp
> >>> ===
> >>> RCS file:
> >>> /cvs/ports/math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp,v
> >>> retrieving revision 1.2
> >>> diff -u -p -r1.2 patch-src_cpp_core_r_util_REnvironmentPosix_cpp
> >>> --- patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp 11 Mar
> >>> 2022 19:36:31 - 1.2
> >>> +++ patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp 12 Jul
> >>> 2022 13:04:35 -
> >>> @@ -8,7 +8,7 @@ Index: src/cpp/core/r_util/REnvironmentP
> >>> #else
> >>>
> >>> -#define kLibRFileName"libR.so"
> >>> -+#define kLibRFileName"libR.so.37.0"
> >>> ++#define kLibRFileName"libR.so.38.0"
> >>> #define kLibraryPathEnvVariable "LD_LIBRARY_PATH"
> >>>
> >>> FilePath systemDefaultRScript(std::string* pErrMsg)
> >>
> >> With a bump, OK rsadowski. Fun fact, there is a comment for this case in
> >> the Makefile :)
> >>
> >
> > Would such a comment not make more sense in math/R/Makefile similar
> > to what's done in security/openssl/{1.1,3.0}/Makefile ?
> >
>
> No objections here. I don't remember why we didn't do that in the first
> place.
Unless there is a better idea using some makefile voodoo (I can't come
up with something that wouldn't use an extra file), I would suggest
this comment.
Another option would be to disable these path checks in RStudio, as they
don't seem to be particularly useful for a packaged version.
Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.125
diff -u -p -r1.125 Makefile
--- Makefile11 Mar 2022 19:36:11 - 1.125
+++ Makefile14 Jul 2022 03:03:54 -
@@ -1,6 +1,8 @@
COMMENT= powerful math/statistics/graphics language
DISTNAME= R-4.1.2
+# When bumping SO_VERSION, adjust
+# math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp
SO_VERSION=38.0
.for _lib in R Rblas Rlapack
SHARED_LIBS += ${_lib} ${SO_VERSION}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 03:22:59 Modified files: x11/gtk-vnc: Makefile distinfo x11/gtk-vnc/patches: patch-src_meson_build x11/gtk-vnc/pkg: PLIST Removed files: x11/gtk-vnc/patches: patch-meson_build patch-subprojects_keycodemapdb_meson_build patch-subprojects_keycodemapdb_tools_keymap-gen Log message: Update to gtk-vnc-1.3.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 03:19:55 Modified files: www/nextcloud/22: Makefile Log message: Missing bump after PLIST change.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 03:18:15 Modified files: www/nextcloud/23: Makefile Log message: Missed bump after PLIST change.
update salt to 3003.5 to make it compatible with >= 3.1
Just when I thought I was out, they pull me back in...
On startup I'm seeing this:
import salt.utils.jinja
File "/usr/local/lib/python3.9/site-packages/salt/utils/jinja.py", line 28,
in
from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
ImportError: cannot import name 'Markup' from 'jinja2'
(/usr/local/lib/python3.9/site-packages/jinja2/__init__.py)
diff --git Makefile Makefile
index 96e1c082663..beb11baee69 100644
--- Makefile
+++ Makefile
@@ -15,7 +15,7 @@
COMMENT = remote execution and configuration management system
-MODPY_EGG_VERSION =3003.4
+MODPY_EGG_VERSION =3003.5
DISTNAME = salt-${MODPY_EGG_VERSION}
CATEGORIES = sysutils net devel
diff --git distinfo distinfo
index ac689254523..d562fcb7c1e 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-3003.4.tar.gz) = 53uAjlG0HX5Jae4VWIrAT9DbmzPfonEPVEGNfrOHJM0=
-SIZE (salt-3003.4.tar.gz) = 16031515
+SHA256 (salt-3003.5.tar.gz) = RSnVG1bG1uHLw0+izj2J63OqkTk13Br+qcH7sJtM7qE=
+SIZE (salt-3003.5.tar.gz) = 16056545
--
I'm not entirely sure you are real.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 02:56:03 Modified files: sysutils/terraform: Makefile distinfo modules.inc Log message: Update to terraform-1.2.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 02:55:26 Modified files: sysutils/terragrunt: Makefile distinfo modules.inc Log message: Update to terragrunt-0.38.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 02:41:21 Modified files: sysutils/consul: Makefile distinfo Log message: Update to consul-1.12.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 02:40:57 Modified files: graphics/gegl04: Makefile distinfo graphics/gegl04/pkg: PLIST Log message: Update to gegl04-0.4.38.
Re: [maintainer update] devel/py-progress-1.6
Timo Myyrä wrote: > Hi, > > Simple bump to py-progress library. Prompted by portno12 a while back. > > Timo committed, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/07/14 02:39:17 Modified files: devel/py-progress: Makefile distinfo devel/py-progress/pkg: PLIST Log message: update devel/py-progress to 1.6 diff from Timo Myyrä (maintainer), thanks!
Re: [maintainer update] x11/stumpwm-22.05
Hello, Timo Myyrä wrote: > Hi, > > Stumpwm has had an release so here's bump for it: > - bump dependency dist versions > - enable core compression support (enabled by default in sbcl) this will need some tweaking with WANTLIB after we update to sbcl 2.2.6 or later, as they switched from zlib to zstd for core compression. Not an issue, just mentioning it. > - set module dir to /usr/local/share/stumpwm/modules > > I'm not sure about setting the module dir when the stumpwm modules are > not installed. But currently it default to use non-existant directory by > default so this seems step in better direction. imho it's better than use a non-existant directory, in the future we might even start packaging some extension maybe? :) will come in handy also, i guess that every stumpwm user has customized their load-path for the modules, so i don't think it'll cause issue. > Any thoughts? works well here, thanks! committed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 02:28:07 Modified files: x11/gnome/console: Makefile distinfo x11/gnome/console/patches: patch-meson_build Log message: Update to gnome-console-42.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/07/14 02:27:49 Modified files: x11/stumpwm: Makefile distinfo Log message: update x11/stumpwm to 22.05 plus: - bump dependency dist versions - enable core compression support (enabled by deafult in sbcl) - set module dir to /usr/local/share/stumpwm/modules diff from maintainer Timo Myyrä, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/07/14 02:24:34 Modified files: devel/libgsf : Makefile distinfo Log message: Update to libgsf-1.14.50.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/07/14 02:09:07 Modified files: devel/qcoro: Makefile Log message: Add missing dependency on x11/qt5/qtwebsockets Spotted by aja, merci
Re: CVS: cvs.openbsd.org: ports
On Sun, Jul 10, 2022 at 07:02:27AM -0600, Rafael Sadowski wrote: > CVSROOT: /cvs > Module name: ports > Changes by: rsadow...@cvs.openbsd.org 2022/07/10 07:02:27 > > Modified files: > devel/qcoro: Makefile distinfo > devel/qcoro/pkg: PLIST > > Log message: > Update qcoro to 0.6.0 CMake Error at /usr/local/lib/qt5/cmake/Qt5/Qt5Config.cmake:28 (find_package): Could not find a package configuration file provided by "Qt5WebSockets" with any of the following names: Qt5WebSocketsConfig.cmake qt5websockets-config.cmake Add the installation prefix of "Qt5WebSockets" to CMAKE_PREFIX_PATH or set "Qt5WebSockets_DIR" to a directory containing one of the above files. If "Qt5WebSockets" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): CMakeLists.txt:73 (find_package) -- Antoine
[update] samba-4.16.2
Work around the build error I had by building --without-gettext.
(hint from upstream: https://bugzilla.samba.org/show_bug.cgi?id=15030)
I don't know whether this could have a negative impact.
libreplace.so and libutil-setid.so are not versioned any more so
the -util package makes less sense. I deciced to just merge -util, -ldb
and -tevent in samba (nothing else uses those libs in a standalone
context anyway). The @conflict and @pkgpath markers seem ok, pkg_add -u
path tested. Overall, this looks like an nice simplification.
Runtime completely untested, feedback and oks welcome. I've tossed this
in a bulk build, I'm not sure how much time I'll have to wait...
Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.313
diff -u -p -r1.313 Makefile
--- Makefile1 Jul 2022 08:39:59 - 1.313
+++ Makefile14 Jul 2022 00:29:19 -
@@ -1,61 +1,37 @@
-VERSION = 4.15.8
+VERSION = 4.16.2
DISTNAME = samba-${VERSION}
EPOCH =0
-REVISION-tevent = 6
COMMENT-main = SMB and CIFS client and server for UNIX
-COMMENT-ldb = LDAP-like embedded database
-COMMENT-tevent = event system based on talloc
-COMMENT-util = common libraries for Samba suite
COMMENT-docs = additional documentation and examples for Samba
PKGNAME-main = ${PKGNAME}
-PKGNAME-ldb = ldb-${LDB_V}
-PKGNAME-tevent = tevent-${TEVENT_V}
-PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
PKG_ARCH-docs =*
-LDB_V =2.4.3
-TEVENT_V = 0.11.0
-
-SHARED_LIBS = asn1-samba4 2.0 \
- com_err-samba4 1.0 \
- dcerpc 1.1 \
+SHARED_LIBS = dcerpc 1.1 \
dcerpc-binding 4.0 \
dcerpc-samr 1.0 \
- dcerpc-server-core 2.0 \
- gssapi-samba4 1.0 \
- hcrypto-samba4 1.0 \
- hdb-samba4 1.0 \
- heimbase-samba4 1.0 \
- heimntlm-samba4 1.0 \
- hx509-samba41.0 \
- kdc-samba4 1.0 \
- krb5-samba4 1.1 \
+ dcerpc-server-core 3.0 \
ldb 2.0 \
ndr 3.0 \
ndr-krb5pac 1.1 \
ndr-nbt 1.0 \
- ndr-standard4.0 \
+ ndr-standard4.1 \
netapi 3.1 \
- roken-samba41.0 \
samba-credentials 1.1 \
samba-errors2.1 \
- samba-hostconfig9.0 \
+ samba-hostconfig9.1 \
samba-passdb3.0 \
- samba-util 7.2 \
+ samba-util 7.3 \
samdb 2.0 \
smbclient 6.1 \
- smbconf 10.1 \
+ smbconf 11.0 \
smbldap 1.0 \
tevent 2.0 \
tevent-util 2.0 \
- wbclient5.0 \
- wind-samba4 1.0 \
- replace 12.1 \
- util-setid 12.0
+ wbclient5.0
# Those have to be handled specially, see "Python ABI" below.
SHARED_LIBS += pyldb-util.cpython-${MODPY_MAJORMINOR} 1.0
@@ -71,37 +47,24 @@ MAINTAINER =Ian McWilliam https://download.samba.org/pub/samba/stable/ \
https://download.samba.org/pub/samba/old-versions/
-MULTI_PACKAGES = -main -ldb -tevent -util -docs
+MULTI_PACKAGES = -main -docs
DEBUG_PACKAGES = ${BUILD_PACKAGES}
MODULES = lang/python perl
-BUILD_DEPENDS =databases/tdb,-python \
+BUILD_DEPENDS =converters/p5-JSON \
+ databases/tdb,-python \
devel/bison \
devel/cmocka \
devel/p5-Parse-Yapp>=1.0.5 \
@@ -113,12 +76,9 @@ RUN_DEPENDS-main = databases/tdb,-python
RUN_DEPENDS-docs =
-LIB_DEPENDS-main =
UPDATE: mail/imapfilter
Update imapfilter to 2.7.5. OK?
Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile11 Mar 2022 19:34:38 - 1.26
+++ Makefile14 Jul 2022 06:28:13 -
@@ -1,8 +1,7 @@
COMMENT= remote IMAP filtering utility
-V= 2.6.11
+V= 2.7.5
DISTNAME= imapfilter-${V}
-REVISION= 0
GH_TAGNAME=v${V}
GH_ACCOUNT=lefcha
@@ -15,12 +14,12 @@ MAINTAINER= Gleydson Soares
UPDATE: www/awstats
Update awstats to 7.8, ok? Index: Makefile === RCS file: /cvs/ports/www/awstats/Makefile,v retrieving revision 1.22 diff -u -p -u -p -r1.22 Makefile --- Makefile11 Mar 2022 20:09:39 - 1.22 +++ Makefile14 Jul 2022 06:05:35 - @@ -1,7 +1,6 @@ COMMENT= free real-time logfile analyzer -DISTNAME= awstats-7.7 -REVISION= 3 +DISTNAME= awstats-7.8 CATEGORIES=www Index: distinfo === RCS file: /cvs/ports/www/awstats/distinfo,v retrieving revision 1.9 diff -u -p -u -p -r1.9 distinfo --- distinfo11 Jan 2018 19:40:29 - 1.9 +++ distinfo14 Jul 2022 06:05:35 - @@ -1,2 +1,2 @@ -SHA256 (awstats-7.7.tar.gz) = Qo5t0BgHxgLXWxfmTbF8oQtFO8oHbZ+0VDTKa+U5d3w= -SIZE (awstats-7.7.tar.gz) = 2956851 +SHA256 (awstats-7.8.tar.gz) = SmWGfgG+9qm9uj6eQR+yoODYe8TIX/AuPL/KABoE1Lg= +SIZE (awstats-7.8.tar.gz) = 2938878 Index: pkg/PLIST === RCS file: /cvs/ports/www/awstats/pkg/PLIST,v retrieving revision 1.9 diff -u -p -u -p -r1.9 PLIST --- pkg/PLIST 11 Mar 2022 20:09:39 - 1.9 +++ pkg/PLIST 14 Jul 2022 06:05:35 - @@ -235,6 +235,8 @@ awstats/wwwroot/cgi-bin/plugins/example/ awstats/wwwroot/cgi-bin/plugins/example/example.pm awstats/wwwroot/cgi-bin/plugins/export_to_csv.pm awstats/wwwroot/cgi-bin/plugins/geoip.pm +awstats/wwwroot/cgi-bin/plugins/geoip2_city.pm +awstats/wwwroot/cgi-bin/plugins/geoip2_country.pm awstats/wwwroot/cgi-bin/plugins/geoip6.pm awstats/wwwroot/cgi-bin/plugins/geoip_asn_maxmind.pm awstats/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm @@ -553,6 +555,7 @@ awstats/wwwroot/icon/flags/ma.png awstats/wwwroot/icon/flags/mc.png awstats/wwwroot/icon/flags/md.png awstats/wwwroot/icon/flags/me.png +awstats/wwwroot/icon/flags/mf.png awstats/wwwroot/icon/flags/mg.png awstats/wwwroot/icon/flags/mil.png awstats/wwwroot/icon/flags/mk.png @@ -624,6 +627,7 @@ awstats/wwwroot/icon/flags/sr.png awstats/wwwroot/icon/flags/st.png awstats/wwwroot/icon/flags/su.png awstats/wwwroot/icon/flags/sv.png +awstats/wwwroot/icon/flags/sx.png awstats/wwwroot/icon/flags/sy.png awstats/wwwroot/icon/flags/sz.png awstats/wwwroot/icon/flags/tc.png @@ -716,6 +720,22 @@ awstats/wwwroot/icon/mime/xsl.png awstats/wwwroot/icon/os/ awstats/wwwroot/icon/os/aix.png awstats/wwwroot/icon/os/amigaos.png +awstats/wwwroot/icon/os/android.png +awstats/wwwroot/icon/os/android10.png +awstats/wwwroot/icon/os/androidcupcake.png +awstats/wwwroot/icon/os/androiddonut.png +awstats/wwwroot/icon/os/androideclair.png +awstats/wwwroot/icon/os/androidfroyo.png +awstats/wwwroot/icon/os/androidgingerbread.png +awstats/wwwroot/icon/os/androidhoneycomb.png +awstats/wwwroot/icon/os/androidics.png +awstats/wwwroot/icon/os/androidjellybean.png +awstats/wwwroot/icon/os/androidkitkat.png +awstats/wwwroot/icon/os/androidlollipop.png +awstats/wwwroot/icon/os/androidmarshmallow.png +awstats/wwwroot/icon/os/androidnougat.png +awstats/wwwroot/icon/os/androidoreo.png +awstats/wwwroot/icon/os/androidpie.png awstats/wwwroot/icon/os/apple.png awstats/wwwroot/icon/os/atari.png awstats/wwwroot/icon/os/beos.png @@ -767,6 +787,9 @@ awstats/wwwroot/icon/os/macosx.png awstats/wwwroot/icon/os/macosx10.png awstats/wwwroot/icon/os/macosx11.png awstats/wwwroot/icon/os/macosx12.png +awstats/wwwroot/icon/os/macosx13.png +awstats/wwwroot/icon/os/macosx14.png +awstats/wwwroot/icon/os/macosx15.png awstats/wwwroot/icon/os/macosx4.png awstats/wwwroot/icon/os/macosx5.png awstats/wwwroot/icon/os/macosx6.png
