Re: UPDATE: audio/soundtouch
You are right Stuart, I was lazy and sloppy with this one. Just ignore the update that I sent. Elias. 2018-05-07 21:50 GMT-03:00 Stuart Henderson : > On 2018/05/07 20:32, Elias M. Mariani wrote: >> Looking for someone to check and commit the change to the CVS. >> Elias. >> >> 2018-05-04 21:02 GMT-03:00 Elias M. Mariani : >> > Looking for someone to check and commit the change to the CVS. >> > Elias. >> > >> > 2018-05-02 20:17 GMT-03:00 Elias M. Mariani : >> >> Hi, >> >> I send a diff for soundtouch, minor change in Makefile from version >> >> 1.9.2 to 2.0.0. >> >> >> >> Soundtouch is a dependency of: >> >> audio/audacity >> >> emulators/desmume >> >> multimedia/gstreamer-0.10/plugins-bad,-main >> >> multimedia/gstreamer1/plugins-bad >> >> >> >> Changes from 1.9.2 to 2.0.0: >> >> https://www.surina.net/soundtouch/soundtouch-abi-tracker/compat_report/soundtouch/1.9.2/2.0.0/65640/abi_compat_report.html >> >> >> >> No changes on patches and PLIST. >> >> Thanks. >> >> Elias. >> > > The diff is obviously wrong because it doesn't touch distinfo. > > Don't introduce a new VERSION variable for this, the version is only > used once so it's pointless. > > The ABI compatibility report you linked makes it clear that a major > shared library version bump is needed. > > You listed things that it's a dependency of, but you don't say whether > you tested them. >
Re: update net/xmlrpc-c
On 7 May 2018 at 23:49, Marc Espie wrote:
> On Mon, May 07, 2018 at 10:57:48PM +0100, David CARLIER wrote:
> > Hi,
> >
> > here a proposal to update xmlrpc-c to the last "stable" release in case
> it
> > might be of interest.
> >
> > Regards.
>
> > ? patches/patch-common_mk
> Looks like you forgot something.
>
>
I always do :-)
> This looks bogus right there. If you control the shared libs version,
> these should be 2.0
>
>
> If you don't, you're missing patches to make it so.
>
Thus an updated version.
Index: Makefile
===
RCS file: /cvs/ports/net/xmlrpc-c/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 8 Dec 2017 17:25:07 - 1.17
+++ Makefile 8 May 2018 08:55:30 -
@@ -7,22 +7,33 @@ NOT_FOR_ARCHS= m88k
COMMENT= XML-RPC C/C++ client-server implementation
CATEGORIES= net devel textproc
-V= 1.06.35
+V= 1.39.12
DISTNAME= xmlrpc-c-${V}
-REVISION= 3
FIX_EXTRACT_PERMISSIONS=Yes
EXTRACT_SUFX= .tgz
-SHARED_LIBS += xmlrpc_util 1.0 # .9.15
-SHARED_LIBS += xmlrpc_abyss 1.0 # .9.15
-SHARED_LIBS += xmlrpc_xmlparse 1.0 # .9.15
-SHARED_LIBS += xmlrpc_xmltok1.0 # .9.15
-SHARED_LIBS += xmlrpc 1.0 # .9.15
-SHARED_LIBS += xmlrpc_server1.0 # .9.15
-SHARED_LIBS += xmlrpc_server_abyss 1.0 # .9.15
-SHARED_LIBS += xmlrpc_client1.0 # .9.15
-SHARED_LIBS += xmlrpc_server_cgi1.0 # .9.15
+SHARED_LIBS += xmlrpc_util 2.0 # .3.39
+SHARED_LIBS += xmlrpc_abyss 2.0 # .3.39
+SHARED_LIBS += xmlrpc_xmlparse 2.0 # .3.39
+SHARED_LIBS += xmlrpc_xmltok 2.0 # .3.39
+SHARED_LIBS += xmlrpc 2.0 # .3.39
+SHARED_LIBS += xmlrpc_server 2.0 # .3.39
+SHARED_LIBS += xmlrpc_server_abyss 2.0 # .3.39
+SHARED_LIBS += xmlrpc_client 2.0 # .3.39
+SHARED_LIBS += xmlrpc_server_cgi 2.0 # .3.39
+SHARED_LIBS += xmlrpc_util++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_abyss++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_xmlparse++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_xmltok++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server_abyss++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server_pstream++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_client++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server_cgi++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_cpp 2.0 # .8.39
+SHARED_LIBS += xmlrpc_packetsocket 2.0 # .8.39
HOMEPAGE= http://xmlrpc-c.sourceforge.net/
@@ -31,7 +42,8 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c crypto curl iconv intl nghttp2 pthread ssl z
+WANTLIB= c crypto curl iconv intl nghttp2 pthread ssl z \
+ ${COMPILER_LIBCXX}
LIB_DEPENDS= devel/gettext \
net/curl
Index: distinfo
===
RCS file: /cvs/ports/net/xmlrpc-c/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:14:55 - 1.6
+++ distinfo 8 May 2018 08:55:30 -
@@ -1,2 +1,2 @@
-SHA256 (xmlrpc-c-1.06.35.tgz) = b8DcmiGUD9WHlbXB+cVL+WM+Gcv0jmKmrmWcgO6fceo=
-SIZE (xmlrpc-c-1.06.35.tgz) = 701970
+SHA256 (xmlrpc-c-1.39.12.tgz) = 2DDzJkqDLf4J9inMZANqz9CBIWklJtD6vgkPf/iBzgg=
+SIZE (xmlrpc-c-1.39.12.tgz) = 816428
Index: patches/patch-Makefile_common
===
RCS file: patches/patch-Makefile_common
diff -N patches/patch-Makefile_common
--- patches/patch-Makefile_common 15 Mar 2008 10:35:54 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-Makefile_common,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
Makefile.common.orig Fri Jul 13 02:32:20 2007
-+++ Makefile.common Wed Jan 16 14:20:17 2008
-@@ -32,11 +32,11 @@ CFLAGS_COMMON = -DNDEBUG
- CXXFLAGS_COMMON = -DNDEBUG
-
- ifeq ($(C_COMPILER_GNU),yes)
-- CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3
-+ CFLAGS_COMMON += $(GCC_C_WARNINGS) -O2 -g -pthread $(COPTS)
- endif
-
- ifeq ($(CXX_COMPILER_GNU),yes)
-- CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -g
-+ CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -O2 -g -pthread $(COPTS)
- endif
-
- DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
-@@ -259,6 +259,10 @@ $(ALL_OBJS): $(BUILDDIR)/include/xmlrpc-c/config.h
-
- ifeq ($(SHARED_LIB_TYPE),unix)
- include $(SRCDIR)/unix-common.make
-+ endif
-+
-+ifeq ($(SHARED_LIB_TYPE),openbsd)
-+ include $(SRCDIR)/openbsd-common.make
- endif
-
- ifeq ($(SHARED_LIB_TYPE),irix)
Index: patches/patch-Makefile_config_in
===
RCS file: patches/patch-Makefile_config_in
diff -N patches/patch-Makefile_config_in
--- patches/patch-Makefile_config_in 14 Mar 2009 19:01:
Re: update net/xmlrpc-c
On 2018/05/08 09:57, David CARLIER wrote:
> @@ -34,34 +40,78 @@ include/xmlrpc_client.h
> include/xmlrpc_server.h
> include/xmlrpc_server_w32httpsys.h
> lib/libxmlrpc++.a
> +lib/libxmlrpc++.so
> +lib/libxmlrpc++.so.2
These symlinks are wrong..
> +@lib lib/libxmlrpc++.so.${LIBxmlrpc++_VERSION}
> lib/libxmlrpc.a
> -lib/libxmlrpc.la
> +lib/libxmlrpc.so
> +lib/libxmlrpc.so.2
> @lib lib/libxmlrpc.so.${LIBxmlrpc_VERSION}
(same for the rest of libs).
UPDATE znc to 1.7.0
hello! I updated znc irc bouncer to 1.7
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/znc/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile 16 Nov 2017 23:20:39 - 1.35
+++ Makefile 8 May 2018 10:20:27 -
@@ -2,10 +2,9 @@
COMMENT= advanced IRC bouncer
-DISTNAME= znc-1.6.5
+DISTNAME= znc-1.7.0
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}releases/
-REVISION= 0
HOMEPAGE= http://znc.in/
@@ -14,22 +13,14 @@ MAINTAINER= Brad Smith
Re: update net/xmlrpc-c
Thanks for inputs, here an update version.
On 8 May 2018 at 09:22, Stuart Henderson wrote:
> On 2018/05/08 09:57, David CARLIER wrote:
> > @@ -34,34 +40,78 @@ include/xmlrpc_client.h
> > include/xmlrpc_server.h
> > include/xmlrpc_server_w32httpsys.h
> > lib/libxmlrpc++.a
> > +lib/libxmlrpc++.so
> > +lib/libxmlrpc++.so.2
>
> These symlinks are wrong..
>
> > +@lib lib/libxmlrpc++.so.${LIBxmlrpc++_VERSION}
> > lib/libxmlrpc.a
> > -lib/libxmlrpc.la
> > +lib/libxmlrpc.so
> > +lib/libxmlrpc.so.2
> > @lib lib/libxmlrpc.so.${LIBxmlrpc_VERSION}
>
> (same for the rest of libs).
>
>
Index: Makefile
===
RCS file: /cvs/ports/net/xmlrpc-c/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 8 Dec 2017 17:25:07 - 1.17
+++ Makefile 8 May 2018 10:36:16 -
@@ -7,22 +7,33 @@ NOT_FOR_ARCHS= m88k
COMMENT= XML-RPC C/C++ client-server implementation
CATEGORIES= net devel textproc
-V= 1.06.35
+V= 1.39.12
DISTNAME= xmlrpc-c-${V}
-REVISION= 3
FIX_EXTRACT_PERMISSIONS=Yes
EXTRACT_SUFX= .tgz
-SHARED_LIBS += xmlrpc_util 1.0 # .9.15
-SHARED_LIBS += xmlrpc_abyss 1.0 # .9.15
-SHARED_LIBS += xmlrpc_xmlparse 1.0 # .9.15
-SHARED_LIBS += xmlrpc_xmltok1.0 # .9.15
-SHARED_LIBS += xmlrpc 1.0 # .9.15
-SHARED_LIBS += xmlrpc_server1.0 # .9.15
-SHARED_LIBS += xmlrpc_server_abyss 1.0 # .9.15
-SHARED_LIBS += xmlrpc_client1.0 # .9.15
-SHARED_LIBS += xmlrpc_server_cgi1.0 # .9.15
+SHARED_LIBS += xmlrpc_util 2.0 # .3.39
+SHARED_LIBS += xmlrpc_abyss 2.0 # .3.39
+SHARED_LIBS += xmlrpc_xmlparse 2.0 # .3.39
+SHARED_LIBS += xmlrpc_xmltok 2.0 # .3.39
+SHARED_LIBS += xmlrpc 2.0 # .3.39
+SHARED_LIBS += xmlrpc_server 2.0 # .3.39
+SHARED_LIBS += xmlrpc_server_abyss 2.0 # .3.39
+SHARED_LIBS += xmlrpc_client 2.0 # .3.39
+SHARED_LIBS += xmlrpc_server_cgi 2.0 # .3.39
+SHARED_LIBS += xmlrpc_util++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_abyss++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_xmlparse++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_xmltok++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server_abyss++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server_pstream++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_client++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_server_cgi++ 2.0 # .8.39
+SHARED_LIBS += xmlrpc_cpp 2.0 # .8.39
+SHARED_LIBS += xmlrpc_packetsocket 2.0 # .8.39
HOMEPAGE= http://xmlrpc-c.sourceforge.net/
@@ -31,7 +42,8 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c crypto curl iconv intl nghttp2 pthread ssl z
+WANTLIB= c crypto curl iconv intl nghttp2 pthread ssl z \
+ ${COMPILER_LIBCXX}
LIB_DEPENDS= devel/gettext \
net/curl
Index: distinfo
===
RCS file: /cvs/ports/net/xmlrpc-c/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:14:55 - 1.6
+++ distinfo 8 May 2018 10:36:16 -
@@ -1,2 +1,2 @@
-SHA256 (xmlrpc-c-1.06.35.tgz) = b8DcmiGUD9WHlbXB+cVL+WM+Gcv0jmKmrmWcgO6fceo=
-SIZE (xmlrpc-c-1.06.35.tgz) = 701970
+SHA256 (xmlrpc-c-1.39.12.tgz) = 2DDzJkqDLf4J9inMZANqz9CBIWklJtD6vgkPf/iBzgg=
+SIZE (xmlrpc-c-1.39.12.tgz) = 816428
Index: patches/patch-Makefile_common
===
RCS file: patches/patch-Makefile_common
diff -N patches/patch-Makefile_common
--- patches/patch-Makefile_common 15 Mar 2008 10:35:54 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-Makefile_common,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
Makefile.common.orig Fri Jul 13 02:32:20 2007
-+++ Makefile.common Wed Jan 16 14:20:17 2008
-@@ -32,11 +32,11 @@ CFLAGS_COMMON = -DNDEBUG
- CXXFLAGS_COMMON = -DNDEBUG
-
- ifeq ($(C_COMPILER_GNU),yes)
-- CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3
-+ CFLAGS_COMMON += $(GCC_C_WARNINGS) -O2 -g -pthread $(COPTS)
- endif
-
- ifeq ($(CXX_COMPILER_GNU),yes)
-- CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -g
-+ CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -O2 -g -pthread $(COPTS)
- endif
-
- DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
-@@ -259,6 +259,10 @@ $(ALL_OBJS): $(BUILDDIR)/include/xmlrpc-c/config.h
-
- ifeq ($(SHARED_LIB_TYPE),unix)
- include $(SRCDIR)/unix-common.make
-+ endif
-+
-+ifeq ($(SHARED_LIB_TYPE),openbsd)
-+ include $(SRCDIR)/openbsd-common.make
- endif
-
- ifeq ($(SHARED_LIB_TYPE),irix)
Index: patches/patch-Makefile_config_in
===
RCS file: patches/patch-Makefile_config_in
diff -N patches/patch-
Re: update net/xmlrpc-c
On 2018/05/08 10:38, David CARLIER wrote: > Thanks for inputs, here an update version. I've just tried this, with changed SHARED_LIBS lines (because these lines are meant to be the "source of truth" for library versions, i.e. you should be able to change these in the port Makefile and the build should change to produce files with those version numbers), but it still generates the files as .so.2.0 files. (Then looking at the patches it's clear why this is the case :) >From the port Makefile, you have access to variables like >LIBxmlrpc_util_VERSION that you can feed into the build environment, if these need to be modified you can use e.g. LIBxmlrpc_util_VERSION:R for the major version, LIBxmlrpc_util_VERSION:E for the minor. It's not quite perfect but I don't think there will be any major complaints if you use the same library versioning for all libraries, something like .for i in xmlrpc xmlrpc_abyss xmlrpc_client [..] SHARED_LIBS += $i 2.0 .endfor to simplify the patching/passthrough that is needed.
Re: update net/xmlrpc-c
Thanks again, you re right.
On 8 May 2018 at 12:13, Stuart Henderson wrote:
> On 2018/05/08 10:38, David CARLIER wrote:
> > Thanks for inputs, here an update version.
>
> I've just tried this, with changed SHARED_LIBS lines (because these lines
> are meant to be the "source of truth" for library versions, i.e. you
> should be able to change these in the port Makefile and the build should
> change to produce files with those version numbers), but it still
> generates the files as .so.2.0 files. (Then looking at the patches it's
> clear why this is the case :)
>
> From the port Makefile, you have access to variables like
> LIBxmlrpc_util_VERSION
> that you can feed into the build environment, if these need to be
> modified you can use e.g. LIBxmlrpc_util_VERSION:R for the major version,
> LIBxmlrpc_util_VERSION:E for the minor.
>
> It's not quite perfect but I don't think there will be any major complaints
> if you use the same library versioning for all libraries, something like
>
> .for i in xmlrpc xmlrpc_abyss xmlrpc_client [..]
> SHARED_LIBS += $i 2.0
> .endfor
>
> to simplify the patching/passthrough that is needed.
>
>
Index: Makefile
===
RCS file: /cvs/ports/net/xmlrpc-c/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 8 Dec 2017 17:25:07 - 1.17
+++ Makefile 8 May 2018 12:45:17 -
@@ -7,22 +7,20 @@ NOT_FOR_ARCHS= m88k
COMMENT= XML-RPC C/C++ client-server implementation
CATEGORIES= net devel textproc
-V= 1.06.35
+V= 1.39.12
DISTNAME= xmlrpc-c-${V}
-REVISION= 3
FIX_EXTRACT_PERMISSIONS=Yes
EXTRACT_SUFX= .tgz
-SHARED_LIBS += xmlrpc_util 1.0 # .9.15
-SHARED_LIBS += xmlrpc_abyss 1.0 # .9.15
-SHARED_LIBS += xmlrpc_xmlparse 1.0 # .9.15
-SHARED_LIBS += xmlrpc_xmltok1.0 # .9.15
-SHARED_LIBS += xmlrpc 1.0 # .9.15
-SHARED_LIBS += xmlrpc_server1.0 # .9.15
-SHARED_LIBS += xmlrpc_server_abyss 1.0 # .9.15
-SHARED_LIBS += xmlrpc_client1.0 # .9.15
-SHARED_LIBS += xmlrpc_server_cgi1.0 # .9.15
+.for i in xmlrpc_util xmlrpc_abyss xmlrpc_xmlparse xmlrpc_xmltok \
+ xmlrpc xmlrpc_server xmlrpc_server_abyss xmlrpc_client \
+ xmlrpc_server_cgi xmlrpc_util++ xmlrpc_abyss++ \
+ xmlrpc_xmlparse++ xmlrpc_xmltok++ xmlrpc++ xmlrpc_server++ \
+ xmlrpc_server_abyss++ xmlrpc_server_pstream++ xmlrpc_client++ \
+ xmlrpc_server_cgi++ xmlrpc_cpp xmlrpc_packetsocket
+SHARED_LIBS += $i 2.0
+.endfor
HOMEPAGE= http://xmlrpc-c.sourceforge.net/
@@ -31,7 +29,8 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c crypto curl iconv intl nghttp2 pthread ssl z
+WANTLIB= c crypto curl iconv intl nghttp2 pthread ssl z \
+ ${COMPILER_LIBCXX}
LIB_DEPENDS= devel/gettext \
net/curl
@@ -39,7 +38,9 @@ LIB_DEPENDS= devel/gettext \
CONFIGURE_STYLE= gnu
USE_GMAKE= Yes
-MAKE_ENV= COPTS="${CFLAGS}"
+MAKE_ENV= COPTS="${CFLAGS}"\
+ LIB_MAJ=${LIBxmlrpc_VERSION:R} \
+ LIB_MIN=${LIBxmlrpc_VERSION:E} \
# we don't have libwww for now, this guards against picking it up
# if somebody ports it
Index: distinfo
===
RCS file: /cvs/ports/net/xmlrpc-c/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:14:55 - 1.6
+++ distinfo 8 May 2018 12:45:17 -
@@ -1,2 +1,2 @@
-SHA256 (xmlrpc-c-1.06.35.tgz) = b8DcmiGUD9WHlbXB+cVL+WM+Gcv0jmKmrmWcgO6fceo=
-SIZE (xmlrpc-c-1.06.35.tgz) = 701970
+SHA256 (xmlrpc-c-1.39.12.tgz) = 2DDzJkqDLf4J9inMZANqz9CBIWklJtD6vgkPf/iBzgg=
+SIZE (xmlrpc-c-1.39.12.tgz) = 816428
Index: patches/patch-Makefile_common
===
RCS file: patches/patch-Makefile_common
diff -N patches/patch-Makefile_common
--- patches/patch-Makefile_common 15 Mar 2008 10:35:54 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-Makefile_common,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
Makefile.common.orig Fri Jul 13 02:32:20 2007
-+++ Makefile.common Wed Jan 16 14:20:17 2008
-@@ -32,11 +32,11 @@ CFLAGS_COMMON = -DNDEBUG
- CXXFLAGS_COMMON = -DNDEBUG
-
- ifeq ($(C_COMPILER_GNU),yes)
-- CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3
-+ CFLAGS_COMMON += $(GCC_C_WARNINGS) -O2 -g -pthread $(COPTS)
- endif
-
- ifeq ($(CXX_COMPILER_GNU),yes)
-- CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -g
-+ CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -O2 -g -pthread $(COPTS)
- endif
-
- DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
-@@ -259,6 +259,10 @@ $(ALL_OBJS): $(BUILDDIR)/include/xmlrpc-c/config.h
-
- ifeq ($(SHARED_LIB_TYPE),unix)
- include $(SRCDIR)/unix-common.make
-+ endif
-+
-+ifeq ($(SHARED_LIB_TYPE),openbsd)
-+ include $(SRCDIR)/openbsd-common.make
- endif
-
- ifeq ($(SHARED_LIB_TYPE),irix)
Index: patches/patch-Makefile_config_in
=
Re: net/isync: use pledge
On Sat, May 05 2018, Klemens Nanni wrote:
> It's still running with prot_exec due to ecurity/cyrus-sasl2, but that's
> subject to change in an updated diff once I've fiddled with multiple
> accounts and different `AuthMeths' configurations.
>
> The diff is relatively straight forward, but I'm happy to hear feedback
> from you. Make sure to include the relevant trace lines if mbsync gets
> killed:
>
> $ ktrace -di -- mbsync -a
> $ kdump
>
> Adding myself as MAINTAINER and dropping `-g' from CFLAGS since it's
> already handled through DEBUG.
>
> Feedback? OK?
I think so far most pledge calls are done with string literals rather
than one string modified according to what the program needs.
In the base tree, it seems that only getent(1) uses a non-literal as
pledge(2) argument, but the underlying string is still not mutable.
Searching the ports tree using grep -sER 'pledge\([^2")]':
--8<--
russell /usr/ports$ grep -sER 'pledge\([^2")]' !(distfiles)
devel/rgbds/patches/patch-src_asm_main_c:+int pledge(const char *, const char
*);
devel/rgbds/patches/patch-src_fix_main_c:+int pledge(const char *, const char
*);
devel/rgbds/patches/patch-src_gfx_main_c:+int pledge(const char *, const char
*);
devel/rgbds/patches/patch-src_link_main_c:+int pledge(const char *, const char
*);
mail/isync/patches/patch-src_main_c:+ if (pledge(main_promises, NULL) == -1)
mail/isync/patches/patch-src_main_c:+ if (pledge(main_promises, NULL)
== -1)
mail/isync/patches/patch-src_main_c:+ if (pledge(main_promises, NULL)
== -1)
security/hitch/patches/patch-src_hitch_c:+ if
(pledge(work_promises, NULL) == -1)
security/hitch/patches/patch-src_hitch_c:+ if
(pledge(ocsp_promises, NULL) == -1)
security/hitch/patches/patch-src_hitch_c:+ if
(pledge(main_promises, NULL) == -1)
textproc/ripgrep/patches/patch-src_main_rs:+fn pledge(promises: *const
libc::c_char, execpromises: *const libc::c_char) -> libc::c_int;
textproc/ripgrep/patches/patch-src_main_rs:+if unsafe {
pledge(promises.as_ptr(), execpromises) } == -1 {
-->8--
hitch and isync would be the first programs to use this pattern.
I'm not sure it makes it easier to *think* about promises made in
a program, and I don't see a reason to go down that road.
The MAINTAINER and CONFIGURE_ENV bits are ok jca@
Looks like the license marker ought to be GPLv2+.
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.33
> diff -u -p -r1.33 Makefile
> --- Makefile 17 Nov 2017 00:22:39 - 1.33
> +++ Makefile 5 May 2018 20:45:15 -
> @@ -3,14 +3,19 @@
> COMMENT= synchronize IMAP4 and maildir mailboxes
>
> DISTNAME=isync-1.3.0
> +REVISION=0
> +
> CATEGORIES= mail
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=isync/}
>
> HOMEPAGE=http://isync.sourceforge.net/
>
> +MAINTAINER= Klemens Nanni
> +
> # GPLv2
> PERMIT_PACKAGE_CDROM=Yes
>
> +# uses pledge()
> WANTLIB= c crypto db sasl2 ssl z
>
> COMPILER=base-clang ports-clang ports-gcc
> @@ -20,7 +25,7 @@ LIB_DEPENDS=databases/db/v4 \
>
> SEPARATE_BUILD= Yes
> CONFIGURE_STYLE= gnu
> -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4
> -g" \
> +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4" \
> CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
>
> Index: patches/patch-src_drv_imap_c
> ===
> RCS file: patches/patch-src_drv_imap_c
> diff -N patches/patch-src_drv_imap_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_drv_imap_c 5 May 2018 20:45:15 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: src/drv_imap.c
> +--- src/drv_imap.c.orig
> src/drv_imap.c
> +@@ -41,6 +41,8 @@
> + # include
> + #endif
> +
> ++extern int needs_proc_exec;
> ++
> + #ifdef HAVE_LIBSSL
> + enum { SSL_None, SSL_STARTTLS, SSL_IMAPS };
> + #endif
> +@@ -3267,6 +3269,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
> + }
> + acc_opt = 1;
> + }
> ++if (server->sconf.tunnel || server->pass_cmd)
> ++needs_proc_exec = 1;
> + if (store)
> + type = "IMAP store", name = store->gen.name;
> + else
> Index: patches/patch-src_main_c
> ===
> RCS file: patches/patch-src_main_c
> diff -N patches/patch-src_main_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_main_c 5 May 2018 20:45:15 -
> @@ -0,0 +1,70 @@
> +$OpenBSD$
> +
> +Index: src/main.c
> +--- src/main.c.orig
> src/main.c
> +@@ -120,6 +120,26 @@ PACKAGE " " VERSION " - mailbox synchronizer\n"
> + exit( code );
> + }
> +
> ++int needs_proc_exec = 0;
> ++char main_promises[] =
[PHP] move phar to module - probably make php7 build on sparc64
Hello ports@,
This diff moves phar to its own subpackage, which requires quite a bit
of changes:
- Since -phar breaks sparc64, allow it to be disabled
- For specifying what package doesn't build on a certain architecture I
use NOT_FOR_ARCHS-phar (BROKEN- doesn't work on subpackages)
- To determine if a package is built I require BUILD_PACKAGES, which in
turn requires bsd.port.arch.mk to be loaded earlier.
- MULTI_PACKAGES (and by extend PHP_EXTENSIONS) need to be defined
before bsd.port.arch.mk is loaded to have the full list.
I don't know on what component HPPA fails, but this platform might also
benefit from this trick. I don't have the machine to test it though.
As for the other changes:
- Install phar-${PV} similar to php-config-${PV}
- Install the phar manpage
- Move the phar headers to the phar subpackage
This also requires the addition of the phar module as a runtime
dependency on icinga-web, drush, nextcloud, owncloud and composer.
I'm just not sure (except for composer) how optional the use of the
phar extension is. If people who are more familiar with these tools
could shed some light on this it'd be welcome.
Comments, thoughts, scoldings, testings on sparc64, other ways to set
this up, OKs?
martijn@
Index: lang/php/Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.103
diff -u -p -a -u -r1.103 Makefile.inc
--- lang/php/Makefile.inc 8 May 2018 12:04:55 - 1.103
+++ lang/php/Makefile.inc 8 May 2018 15:26:51 -
@@ -110,6 +110,10 @@ TEST_TARGET= test
TEST_FLAGS=NO_INTERACTION=1
SAPI+= -main -cgi
+PHP_EXTENSIONS+= -bz2 -curl -dba -gd -gmp -intl -imap -ldap -mcrypt \
+ -mysqli -odbc -pcntl -pdo_mysql -pdo_pgsql -pgsql \
+ -phar -pspell -shmop -soap -snmp -pdo_dblib -tidy \
+ -xmlrpc -xsl -zip
ZEND_EXTENSIONS+= -opcache
MULTI_PACKAGES+= ${SAPI} ${PHP_EXTENSIONS}
@@ -122,34 +126,36 @@ LIB_DEPENDS$i+= devel/gettext \
textproc/libxml
.endfor
+#
+# Broken section
+# Use *_FOR_ARCHS, since BROKEN doesn't work for subpackages
+#
+
+.include
#
# Loadable php extensions by name that are included in all versions
#
# bz2
-PHP_EXTENSIONS+= -bz2
COMMENT-bz2= bzip2 compression extensions for php
CONFIGURE_ARGS+= --with-bz2=shared,${LOCALBASE}
LIB_DEPENDS-bz2= archivers/bzip2
WANTLIB-bz2= bz2>=10 pthread
# curl
-PHP_EXTENSIONS+= -curl
COMMENT-curl= curl URL library extensions for php
CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
LIB_DEPENDS-curl= net/curl
WANTLIB-curl= pthread crypto nghttp2 ssl z curl>=2
# dba
-PHP_EXTENSIONS+= -dba
COMMENT-dba= dba GDBM access extensions for php
CONFIGURE_ARGS+= --enable-dba=shared --with-gdbm=${LOCALBASE}
LIB_DEPENDS-dba= databases/gdbm
WANTLIB-dba= gdbm>=2 pthread
# gd
-PHP_EXTENSIONS+= -gd
COMMENT-gd=image manipulation extensions for php
LIB_DEPENDS-gd=graphics/jpeg \
graphics/png
@@ -167,14 +173,12 @@ CONFIGURE_ARGS+= --with-gd=shared \
--with-xpm-dir=${X11BASE}
# gmp
-PHP_EXTENSIONS+= -gmp
COMMENT-gmp= gmp math library support for php
CONFIGURE_ARGS+= --with-gmp=shared,${LOCALBASE}
LIB_DEPENDS-gmp= devel/gmp
WANTLIB-gmp= gmp>=4 pthread
# intl
-PHP_EXTENSIONS+= -intl
COMMENT-intl= intl library support for php
CONFIGURE_ARGS+= --enable-intl=shared \
--with-icu-dir=${LOCALBASE}
@@ -185,7 +189,6 @@ WANTLIB-intl= icudata icui18n icuio icu
WANTLIB-intl+= ${COMPILER_LIBCXX} m
# imap
-PHP_EXTENSIONS+= -imap
COMMENT-imap= imap, pop3 and nntp extensions for php
CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \
--with-imap-ssl
@@ -193,119 +196,110 @@ LIB_DEPENDS-imap= mail/alpine,-c-client
WANTLIB-imap= pthread crypto ssl c-client>=5
# ldap
-PHP_EXTENSIONS+= -ldap
COMMENT-ldap= ldap protocol extensions for php
CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE}
LIB_DEPENDS-ldap= databases/openldap
WANTLIB-ldap= pthread ldap>=2 lber
# mcrypt
-PHP_EXTENSIONS+= -mcrypt
COMMENT-mcrypt=mcrypt encryption/decryption extensions for php
CONFIGURE_ARGS+= --with-mcrypt=shared,${LOCALBASE}
LIB_DEPENDS-mcrypt=security/libmcrypt devel/libtool,-ltdl
WANTLIB-mcrypt=mcrypt ltdl>=1 pthread
# mysqli
-PHP_EXTENSIONS+= -mysqli
COMMENT-mysqli=mysql database access extensions for php
CONFIGURE_ARGS+= --with-mysqli=shared,${LOCALBASE}/bin/mysql_config
LIB_DEPENDS-mysqli=databases/ma
Re: [PHP] move phar to module - probably make php7 build on sparc64
Better to just fix phar on sparc64...does anyone have more information
on the problem?
On 2018/05/08 17:49, Martijn van Duren wrote:
> Hello ports@,
>
> This diff moves phar to its own subpackage, which requires quite a bit
> of changes:
> - Since -phar breaks sparc64, allow it to be disabled
> - For specifying what package doesn't build on a certain architecture I
> use NOT_FOR_ARCHS-phar (BROKEN- doesn't work on subpackages)
> - To determine if a package is built I require BUILD_PACKAGES, which in
> turn requires bsd.port.arch.mk to be loaded earlier.
> - MULTI_PACKAGES (and by extend PHP_EXTENSIONS) need to be defined
> before bsd.port.arch.mk is loaded to have the full list.
>
> I don't know on what component HPPA fails, but this platform might also
> benefit from this trick. I don't have the machine to test it though.
>
> As for the other changes:
> - Install phar-${PV} similar to php-config-${PV}
> - Install the phar manpage
> - Move the phar headers to the phar subpackage
>
> This also requires the addition of the phar module as a runtime
> dependency on icinga-web, drush, nextcloud, owncloud and composer.
> I'm just not sure (except for composer) how optional the use of the
> phar extension is. If people who are more familiar with these tools
> could shed some light on this it'd be welcome.
>
> Comments, thoughts, scoldings, testings on sparc64, other ways to set
> this up, OKs?
>
> martijn@
>
> Index: lang/php/Makefile.inc
> ===
> RCS file: /cvs/ports/lang/php/Makefile.inc,v
> retrieving revision 1.103
> diff -u -p -a -u -r1.103 Makefile.inc
> --- lang/php/Makefile.inc 8 May 2018 12:04:55 - 1.103
> +++ lang/php/Makefile.inc 8 May 2018 15:26:51 -
> @@ -110,6 +110,10 @@ TEST_TARGET= test
> TEST_FLAGS= NO_INTERACTION=1
>
> SAPI+= -main -cgi
> +PHP_EXTENSIONS+= -bz2 -curl -dba -gd -gmp -intl -imap -ldap -mcrypt \
> + -mysqli -odbc -pcntl -pdo_mysql -pdo_pgsql -pgsql \
> + -phar -pspell -shmop -soap -snmp -pdo_dblib -tidy \
> + -xmlrpc -xsl -zip
> ZEND_EXTENSIONS+=-opcache
> MULTI_PACKAGES+= ${SAPI} ${PHP_EXTENSIONS}
>
> @@ -122,34 +126,36 @@ LIB_DEPENDS$i+= devel/gettext \
> textproc/libxml
> .endfor
>
> +#
> +# Broken section
> +# Use *_FOR_ARCHS, since BROKEN doesn't work for subpackages
> +#
> +
> +.include
>
> #
> # Loadable php extensions by name that are included in all versions
> #
>
> # bz2
> -PHP_EXTENSIONS+= -bz2
> COMMENT-bz2= bzip2 compression extensions for php
> CONFIGURE_ARGS+= --with-bz2=shared,${LOCALBASE}
> LIB_DEPENDS-bz2= archivers/bzip2
> WANTLIB-bz2= bz2>=10 pthread
>
> # curl
> -PHP_EXTENSIONS+= -curl
> COMMENT-curl=curl URL library extensions for php
> CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
> LIB_DEPENDS-curl=net/curl
> WANTLIB-curl=pthread crypto nghttp2 ssl z curl>=2
>
> # dba
> -PHP_EXTENSIONS+= -dba
> COMMENT-dba= dba GDBM access extensions for php
> CONFIGURE_ARGS+= --enable-dba=shared --with-gdbm=${LOCALBASE}
> LIB_DEPENDS-dba= databases/gdbm
> WANTLIB-dba= gdbm>=2 pthread
>
> # gd
> -PHP_EXTENSIONS+= -gd
> COMMENT-gd= image manipulation extensions for php
> LIB_DEPENDS-gd= graphics/jpeg \
> graphics/png
> @@ -167,14 +173,12 @@ CONFIGURE_ARGS+=--with-gd=shared \
> --with-xpm-dir=${X11BASE}
>
> # gmp
> -PHP_EXTENSIONS+= -gmp
> COMMENT-gmp= gmp math library support for php
> CONFIGURE_ARGS+= --with-gmp=shared,${LOCALBASE}
> LIB_DEPENDS-gmp= devel/gmp
> WANTLIB-gmp= gmp>=4 pthread
>
> # intl
> -PHP_EXTENSIONS+= -intl
> COMMENT-intl=intl library support for php
> CONFIGURE_ARGS+= --enable-intl=shared \
> --with-icu-dir=${LOCALBASE}
> @@ -185,7 +189,6 @@ WANTLIB-intl= icudata icui18n icuio icu
> WANTLIB-intl+= ${COMPILER_LIBCXX} m
>
> # imap
> -PHP_EXTENSIONS+= -imap
> COMMENT-imap=imap, pop3 and nntp extensions for php
> CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \
> --with-imap-ssl
> @@ -193,119 +196,110 @@ LIB_DEPENDS-imap= mail/alpine,-c-client
> WANTLIB-imap=pthread crypto ssl c-client>=5
>
> # ldap
> -PHP_EXTENSIONS+= -ldap
> COMMENT-ldap=ldap protocol extensions for php
> CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE}
> LIB_DEPENDS-ldap=databases/openldap
> WANTLIB-ldap=pthread ldap>=2 lber
>
> # mcrypt
> -PHP_EXTENSIONS+= -mcrypt
> COMMENT-mcrypt= mcrypt encryption/decryption extensions for php
> CONFIGURE_ARGS+= --with-mcrypt=shared,${LOCAL
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Sat May 5 03:55:36 MDT 2018 finished at Tue May 8 11:22:53 MDT 2018 lasted 04D00h27m done with kern.version=OpenBSD 6.3-current (GENERIC.MP) #100: Fri May 4 12:54:54 MDT 2018 built packages:8025 May 5:2043 May 6:1480 May 7:1643 May 8:2858 build failures: 77 http://build-failures.rhaalovely.net//aarch64/2018-05-05/audio/audacity.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/comms/hylafax.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/comms/lcdproc.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/arm-none-eabi/gcc-linaro,aarch64.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/avr/gdb.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/bullet.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/include-what-you-use.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/jsonrpc-glib.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/libgtop2.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/ode.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/devel/template-glib.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/editors/emacs21,no_x11,-el.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/editors/ht.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/editors/xwpe.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/emulators/dynamips.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/emulators/higan.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/emulators/retroarch.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/emulators/vbam.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/dungeon-crawl.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/dxx-rebirth.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/eduke32.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/frozen-bubble,-main.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/gargoyle.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/nethack/3.6,qt.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/scid.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/spacehulk.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/uqm.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/vacuum.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/xteddy.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/games/zaz.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/geo/emerillon.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/geo/garmindev.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/geo/geoclue2.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/graphics/clutter/clutter-gst.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/graphics/djvulibre.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/graphics/evince,light.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/graphics/freeimage.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/graphics/gegl03.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/graphics/gegl04.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/japanese/mecab,-ipadic.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/lang/pfe.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/mail/mimetic.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/mail/mozilla-thunderbird,,-main.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/math/gnumeric.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/misc/rocrail,-gui.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/multimedia/gstreamer1/plugins-bad.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/multimedia/mediainfo.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/multimedia/xine-lib.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/net/castget.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/net/ftpcopy.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/net/gupnp/av.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/net/telepathy/telepathy-glib.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/net/uhttpmock.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/net/utox.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/net/xmlrpc-c.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/productivity/aqbanking.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/productivity/workrave.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/security/botan2.log http://build-failures.rhaalovely.net//aarch64/2018-05-05/security/libnipper.log http://build-failures.rhaalovely.net//aarch64/2018
Add BDEP boost to arx-libertatis
Sorry, this was missed. arx-libertatis uses boost (headerfiles only).
The following diff should fix this.
Index: Makefile
===
RCS file: /cvs/ports/games/arx-libertatis/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile6 May 2018 15:15:00 - 1.1.1.1
+++ Makefile8 May 2018 18:11:28 -
@@ -9,6 +9,7 @@ GH_ACCOUNT =arx
GH_PROJECT = ArxLibertatis
GH_TAGNAME = 1.1.2-r1
PKGNAME = arx-libertatis-${GH_TAGNAME:S/-r/pl/}
+REVISION = 0
# GPLv3+, fonts are SIL OFL 1.1 license
PERMIT_PACKAGE_CDROM = Yes
@@ -21,6 +22,7 @@ COMPILER =base-clang ports-gcc ports-cl
MODULES = devel/cmake
+BUILD_DEPENDS =devel/boost>=1.48
LIB_DEPENDS = audio/openal \
devel/sdl \
graphics/glew
Re: net/isync: use pledge
On Tue, May 08, 2018 at 05:06:19PM +0200, Jeremie Courreges-Anglas wrote:
> hitch and isync would be the first programs to use this pattern.
> I'm not sure it makes it easier to *think* about promises made in
> a program, and I don't see a reason to go down that road.
drop_promises() was introduced to simplify scenarios such as
if (a)
if (b)
pledge("w")
else
pledge("x")
else
if (b)
pledge("y")
else
pledge("z")
Pledge's semantics forgid dropping a single promise while keeping
everything else. drop_promise() aids in keeping track of pledge mainly
for programs that weren't designed with priviledge separation in mind.
After all it's just a string so why not working with it? It's far away
from being a dirty hack. And even if it's unusual or new, it gets the
job done.
I'm happy for any kind of suggestions and improvements, that's just all
I got for now to help pledging ports.
> The MAINTAINER and CONFIGURE_ENV bits are ok jca@
Thanks.
> Looks like the license marker ought to be GPLv2+.
AFAIC https://sourceforge.net/p/isync/isync/ci/master/tree/COPYING is GPLv2.
Re: net/isync: use pledge
>On Tue, May 08, 2018 at 05:06:19PM +0200, Jeremie Courreges-Anglas wrote:
>> hitch and isync would be the first programs to use this pattern.
>> I'm not sure it makes it easier to *think* about promises made in
>> a program, and I don't see a reason to go down that road.
>drop_promises() was introduced to simplify scenarios such as
>
> if (a)
> if (b)
> pledge("w")
> else
> pledge("x")
> else
> if (b)
> pledge("y")
> else
> pledge("z")
>
>Pledge's semantics forgid dropping a single promise while keeping
>everything else. drop_promise() aids in keeping track of pledge mainly
>for programs that weren't designed with priviledge separation in mind.
>
>After all it's just a string so why not working with it? It's far away
>from being a dirty hack. And even if it's unusual or new, it gets the
>job done.
You may think it is easier in one respect.
But later, if you look at your last invocation, how do you tell what
pledges remain?
Well, you don't.
By making it very clear what are dropping, you make it vague *what remains*.
And *what remains* is the meat of the matter, because that's the kernel
featureset the program may play again.
Re: net/isync: use pledge
On 2018/05/08 20:25, Klemens Nanni wrote: > > Looks like the license marker ought to be GPLv2+. > AFAIC https://sourceforge.net/p/isync/isync/ci/master/tree/COPYING is GPLv2. The COPYING file doesn't tell you whether it's "v2 only" or "v2 or later", for that you need to look at the actual copyright notice rather than the separate license text. Here it's * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. -> "GPLv2+" (if some software doesn't have a copyright notice with text like that, really they should add it).
Re: aarch64 bulk build report
phess...@openbsd.org: > bulk build on arm64.ports.openbsd.org > started on Sat May 5 03:55:36 MDT 2018 > finished at Tue May 8 11:22:53 MDT 2018 > > build failures: 77 The new #1 problem here is that g-ir-scanner segfaults. That is fallout from the devel/gobject-introspection update during p2k18. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: net/isync: use pledge
On Tue, May 08, 2018 at 12:39:12PM -0600, Theo de Raadt wrote:
> >On Tue, May 08, 2018 at 05:06:19PM +0200, Jeremie Courreges-Anglas wrote:
> >> hitch and isync would be the first programs to use this pattern.
> >> I'm not sure it makes it easier to *think* about promises made in
> >> a program, and I don't see a reason to go down that road.
> >drop_promises() was introduced to simplify scenarios such as
> >
> > if (a)
> > if (b)
> > pledge("w")
> > else
> > pledge("x")
> > else
> > if (b)
> > pledge("y")
> > else
> > pledge("z")
> >
> >Pledge's semantics forgid dropping a single promise while keeping
> >everything else. drop_promise() aids in keeping track of pledge mainly
> >for programs that weren't designed with priviledge separation in mind.
> >
> >After all it's just a string so why not working with it? It's far away
> >from being a dirty hack. And even if it's unusual or new, it gets the
> >job done.
>
> You may think it is easier in one respect.
>
> But later, if you look at your last invocation, how do you tell what
> pledges remain?
>
> Well, you don't.
>
> By making it very clear what are dropping, you make it vague *what remains*.
Yes, that's the (obvious) trade-off I made.
> And *what remains* is the meat of the matter, because that's the kernel
> featureset the program may play again.
So here's a diff for pledging isync the same way as before but without
drop_promises.
Index: Makefile
===
RCS file: /cvs/ports/mail/isync/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile17 Nov 2017 00:22:39 - 1.33
+++ Makefile8 May 2018 20:02:51 -
@@ -3,14 +3,19 @@
COMMENT= synchronize IMAP4 and maildir mailboxes
DISTNAME= isync-1.3.0
+REVISION= 0
+
CATEGORIES=mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
HOMEPAGE= http://isync.sourceforge.net/
-# GPLv2
+MAINTAINER=Klemens Nanni
+
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
+# uses pledge()
WANTLIB= c crypto db sasl2 ssl z
COMPILER= base-clang ports-clang ports-gcc
@@ -20,7 +25,7 @@ LIB_DEPENDS= databases/db/v4 \
SEPARATE_BUILD=Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+=CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4
-g" \
+CONFIGURE_ENV+=CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: patches/patch-src_drv_imap_c
===
RCS file: patches/patch-src_drv_imap_c
diff -N patches/patch-src_drv_imap_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_drv_imap_c8 May 2018 20:02:51 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/drv_imap.c
+--- src/drv_imap.c.orig
src/drv_imap.c
+@@ -41,6 +41,8 @@
+ # include
+ #endif
+
++extern int needs_proc_exec;
++
+ #ifdef HAVE_LIBSSL
+ enum { SSL_None, SSL_STARTTLS, SSL_IMAPS };
+ #endif
+@@ -3267,6 +3269,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
+ }
+ acc_opt = 1;
+ }
++ if (server->sconf.tunnel || server->pass_cmd)
++ needs_proc_exec = 1;
+ if (store)
+ type = "IMAP store", name = store->gen.name;
+ else
Index: patches/patch-src_main_c
===
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_c8 May 2018 20:02:51 -
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+Index: src/main.c
+--- src/main.c.orig
src/main.c
+@@ -120,6 +120,8 @@ PACKAGE " " VERSION " - mailbox synchronizer\n"
+ exit( code );
+ }
+
++int needs_proc_exec = 0;
++
+ static void ATTR_PRINTFLIKE(1, 2)
+ debug( const char *msg, ... )
+ {
+@@ -716,6 +718,29 @@ main( int argc, char **argv )
+
+ if (load_config( config, pseudo ))
+ return 1;
++
++ if (mvars->list) {
++ if (needs_proc_exec) {
++ if (pledge("stdio rpath inet flock dns getpw proc exec"
++ " prot_exec", NULL) == -1)
++ sys_error("pledge\n");
++ } else {
++ if (pledge("stdio rpath inet flock dns getpw"
++ " prot_exec",
++ NULL) == -1)
++ sys_error("pledge\n");
++ }
++ } else {
++ if (needs_proc_exec) {
++ if (pledge("stdio rpath wpath cpath inet flock dns"
++ " getpw proc exec prot_exec", NULL) == -1)
++ sys_error("pledge\n");
++ } else {
++
[UPDATE] Sakura 3.6.0
Hello, ports@!
this is simple update my maintained sakura port to 3.6.0
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/sakura/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile 28 Apr 2018 22:13:57 - 1.21
+++ Makefile 8 May 2018 20:37:40 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2018/04/28 22:13:57 bentley Exp $
-V = 3.5.0
+V = 3.6.0
COMMENT = GTK and VTE based terminal emulator
DISTNAME = sakura-${V}
EXTRACT_SUFX = .tar.bz2
CATEGORIES = x11
-REVISION = 0
HOMEPAGE = http://www.pleyades.net/david/projects/sakura/
MAINTAINER = Victor Kukshiev
@@ -15,7 +14,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gnutls gobject-2.0 gtk-3 intl m pango-1.0
-WANTLIB += pangocairo-1.0 pcre2-8 vte-2.91 z X11
+WANTLIB += pangocairo-1.0 pcre2-8 vte-2.91 z X11 fribidi
MASTER_SITES = https://launchpad.net/sakura/trunk/${V}/+download/
Index: distinfo
===
RCS file: /cvs/ports/x11/sakura/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 28 Apr 2018 18:22:55 - 1.12
+++ distinfo 8 May 2018 20:37:40 -
@@ -1,2 +1,2 @@
-SHA256 (sakura-3.5.0.tar.bz2) = 6zDt5BCD/aKwfGo7c5MVD0iGfoHSjvcLFYJHQMqwDDo=
-SIZE (sakura-3.5.0.tar.bz2) = 55432
+SHA256 (sakura-3.6.0.tar.bz2) = oRYfPO3eIKfhvFmBs+arO5HSzTpf/jXHkqf6QCoehuA=
+SIZE (sakura-3.6.0.tar.bz2) = 56044
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/sakura/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 27 Aug 2016 20:45:06 - 1.5
+++ pkg/PLIST 8 May 2018 20:37:40 -
@@ -1,27 +1,67 @@
@comment $OpenBSD: PLIST,v 1.5 2016/08/27 20:45:06 jca Exp $
@bin bin/sakura
@man man/man1/sakura.1
+share/applications/
share/applications/sakura.desktop
share/doc/sakura/
share/doc/sakura/INSTALL
+share/locale/
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/sakura.mo
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/sakura.mo
+share/locale/de/
+share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/sakura.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/sakura.mo
+share/locale/es/
+share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/sakura.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/sakura.mo
+share/locale/he/
+share/locale/he/LC_MESSAGES/
share/locale/he/LC_MESSAGES/sakura.mo
+share/locale/hr/
+share/locale/hr/LC_MESSAGES/
share/locale/hr/LC_MESSAGES/sakura.mo
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/sakura.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/sakura.mo
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/sakura.mo
+share/locale/ko/
+share/locale/ko/LC_MESSAGES/
share/locale/ko/LC_MESSAGES/sakura.mo
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/sakura.mo
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/sakura.mo
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/sakura.mo
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/sakura.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/sakura.mo
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/sakura.mo
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/sakura.mo
share/pixmaps/
share/pixmaps/terminal-tango.svg
Re: UPDATE devel/git-cola
On Mon, Apr 30 2018, Björn Ketelaars wrote: > Diff below brings git-cola to the latest version (3.1). Overview on > fixes and additions can be found at > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst > > - upstream switched to py.test to execute the test suite instead of > nosetests > - instead of patching Makefile to make it compatible with OpenBSD's > make just switch to gnake. The patch is too big, and too hard to > maintain > - drop patch which has been committed upstream > > make test runs successfully, and (lightly) tested on amd64. > > Comments/OKs? Looks good ports-wise, ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[patch] archivers/p7zip
This patch addresses CVE-2018-10115, an arbitrary code execution bug.
Regression tested on amd64 and i386 on current, 6.3, and 6.2. Diffs for
all three are attached.
Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile9 Apr 2018 15:58:26 - 1.44
+++ Makefile8 May 2018 19:57:34 -
@@ -4,8 +4,8 @@ COMMENT-main= file archiver with high co
COMMENT-rar= rar modules for p7zip
V= 16.02
-REVISION-main= 4
-REVISION-rar= 1
+REVISION-main= 5
+REVISION-rar= 2
DISTNAME= p7zip_${V}_src_all
PKGNAME= p7zip-${V}
PKGNAME-main= p7zip-${V}
Index: patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_cpp
===
RCS file: patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_cpp
diff -N patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_cpp 8 May 2018 19:45:54
-
@@ -0,0 +1,49 @@
+$OpenBSD$
+
+Fix for CVE-2018-10115, from Denisov Denis.
+
+Index: CPP/7zip/Archive/Rar/Rar5Handler.cpp
+--- CPP/7zip/Archive/Rar/Rar5Handler.cpp.orig
CPP/7zip/Archive/Rar/Rar5Handler.cpp
+@@ -102,11 +102,11 @@ static unsigned ReadVarInt(const Byte *p, size_t maxSi
+ {
+ *val = 0;
+
+- for (unsigned i = 0; i < maxSize;)
++ for (unsigned i = 0; i < maxSize && i < 10;)
+ {
+ Byte b = p[i];
+-if (i < 10)
+- *val |= (UInt64)(b & 0x7F) << (7 * i++);
++*val |= (UInt64)(b & 0x7F) << (7 * i);
++i++;
+ if ((b & 0x80) == 0)
+ return i;
+ }
+@@ -1182,6 +1182,7 @@ static const Byte kProps[] =
+ kpidSymLink,
+ kpidHardLink,
+ kpidCopyLink,
++ kpidVolumeIndex
+ };
+
+
+@@ -1601,6 +1602,18 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPI
+
+ case kpidSplitBefore: prop = item.IsSplitBefore(); break;
+ case kpidSplitAfter: prop = lastItem.IsSplitAfter(); break;
++
++case kpidVolumeIndex:
++{
++ if (item.VolIndex < _arcs.Size())
++ {
++const CInArcInfo &arcInfo = _arcs[item.VolIndex].Info;
++if (arcInfo.IsVolume())
++ prop = (UInt64)arcInfo.GetVolIndex();
++ }
++ break;
++}
++
+ case kpidCRC:
+ {
+ const CItem *item2 = (lastItem.IsSplitAfter() ? &item : &lastItem);
Index: patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_h
===
RCS file: patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_h
diff -N patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_Archive_Rar_Rar5Handler_h8 May 2018 19:46:51
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix for CVE-2018-10115, from Denisov Denis.
+
+Index: CPP/7zip/Archive/Rar/Rar5Handler.h
+--- CPP/7zip/Archive/Rar/Rar5Handler.h.orig
CPP/7zip/Archive/Rar/Rar5Handler.h
+@@ -168,7 +168,7 @@ struct CItem
+
+ AString Name;
+
+- int VolIndex;
++ unsigned VolIndex;
+ int NextItem;
+
+ UInt32 UnixMTime;
Index: patches/patch-CPP_7zip_Archive_Rar_RarHandler_cpp
===
RCS file: patches/patch-CPP_7zip_Archive_Rar_RarHandler_cpp
diff -N patches/patch-CPP_7zip_Archive_Rar_RarHandler_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_Archive_Rar_RarHandler_cpp 8 May 2018 19:46:59
-
@@ -0,0 +1,30 @@
+$OpenBSD$
+
+Fix for CVE-2018-10115, from Denisov Denis.
+
+Index: CPP/7zip/Archive/Rar/RarHandler.cpp
+--- CPP/7zip/Archive/Rar/RarHandler.cpp.orig
CPP/7zip/Archive/Rar/RarHandler.cpp
+@@ -768,7 +768,8 @@ static const Byte kProps[] =
+ kpidCRC,
+ kpidHostOS,
+ kpidMethod,
+- kpidUnpackVer
++ kpidUnpackVer,
++ kpidVolumeIndex
+ };
+
+ static const Byte kArcProps[] =
+@@ -989,6 +990,12 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPI
+ case kpidCommented: prop = item.IsCommented(); break;
+ case kpidSplitBefore: prop = item.IsSplitBefore(); break;
+ case kpidSplitAfter: prop = _items[refItem.ItemIndex + refItem.NumItems -
1].IsSplitAfter(); break;
++
++case kpidVolumeIndex:
++ if (_arcInfo.Is_VolNumber_Defined())
++prop = (UInt32)(_arcInfo.VolNumber + refItem.VolumeIndex);
++ break;
++
+ case kpidCRC:
+ {
+ prop = ((lastItem.IsSplitAfter()) ? item.FileCRC : lastItem.FileCRC);
Index: patches/patch-CPP_7zip_Archive_Rar_RarHandler_h
===
RCS file: patches/patch-CPP_7zip_Archive_Rar_RarHandler_h
diff -N patches/patch-CPP_7zip_Archive_Rar_RarHandler_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_Archive_Rar_RarHandler_h 8 May 2018 19:47:06
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix for CVE-2018-10115, from Denisov Denis.
+
+Index: CPP/7zip/Archive/Rar/RarHandler.h
+--- CPP/7zip/Archiv
Re: lld amd64 build failures
On Mon, 7 May 2018 20:16:40 -0400 James Turner wrote: > On Tue, May 08, 2018 at 12:09:58AM +, Ian McWilliam wrote: > > > > I know it won't help the resolve the issue. > > > > > > https://reviews.llvm.org/D25324 > > > > > > [ELF] - Check that section alignment is a power of 2. > > > > > > > > > > Ian McWilliam > > > > > > Interesting, I'll try shooting this upstream and see what the developer > thinks. > Upstream here. I'll update to the latest -CURRENT and give this a shot tonight, then put out a new point release. I don't remember specifying section alignment, but clearly it's getting set *somewhere*. I think it'll be a pretty simple fix, once I figure out exactly which section lld is complaining about. -- Ori Bernstein
Re: Add BDEP boost to arx-libertatis
On Tue, May 08, 2018 at 11:14:01AM -0700, Thomas Frohwein wrote:
> Sorry, this was missed. arx-libertatis uses boost (headerfiles only).
> The following diff should fix this.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/arx-libertatis/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 6 May 2018 15:15:00 - 1.1.1.1
> +++ Makefile 8 May 2018 18:11:28 -
> @@ -9,6 +9,7 @@ GH_ACCOUNT = arx
> GH_PROJECT = ArxLibertatis
> GH_TAGNAME = 1.1.2-r1
> PKGNAME =arx-libertatis-${GH_TAGNAME:S/-r/pl/}
> +REVISION = 0
>
> # GPLv3+, fonts are SIL OFL 1.1 license
> PERMIT_PACKAGE_CDROM = Yes
> @@ -21,6 +22,7 @@ COMPILER = base-clang ports-gcc ports-cl
>
> MODULES =devel/cmake
>
> +BUILD_DEPENDS = devel/boost>=1.48
> LIB_DEPENDS =audio/openal \
> devel/sdl \
> graphics/glew
BUILD_DEPENDS added.
(No need to bump, no package change)
Re: net/isync: use pledge
On Tue, May 08 2018, Klemens Nanni wrote: > On Tue, May 08, 2018 at 12:39:12PM -0600, Theo de Raadt wrote: [...] >> By making it very clear what are dropping, you make it vague *what remains*. > Yes, that's the (obvious) trade-off I made. > >> And *what remains* is the meat of the matter, because that's the kernel >> featureset the program may play again. > > So here's a diff for pledging isync the same way as before but without > drop_promises. Maybe uglier, but easier to understand. The changes look fine. ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Add BDEP boost to arx-libertatis
I was going to report this as I hit the problem building this.
I suggest that more is required, how exactly are boost headers used? A
RUN_DEPENDS may have to be added for boost.
I haven't looked to see if there is a way to disable the need for boost.
The REVISION bump is normally not required for build only issues.
On 05/08/18 19:14, Thomas Frohwein wrote:
> Sorry, this was missed. arx-libertatis uses boost (headerfiles only).
> The following diff should fix this.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/arx-libertatis/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 6 May 2018 15:15:00 - 1.1.1.1
> +++ Makefile 8 May 2018 18:11:28 -
> @@ -9,6 +9,7 @@ GH_ACCOUNT = arx
> GH_PROJECT = ArxLibertatis
> GH_TAGNAME = 1.1.2-r1
> PKGNAME =arx-libertatis-${GH_TAGNAME:S/-r/pl/}
> +REVISION = 0
>
> # GPLv3+, fonts are SIL OFL 1.1 license
> PERMIT_PACKAGE_CDROM = Yes
> @@ -21,6 +22,7 @@ COMPILER = base-clang ports-gcc ports-cl
>
> MODULES =devel/cmake
>
> +BUILD_DEPENDS = devel/boost>=1.48
> LIB_DEPENDS =audio/openal \
> devel/sdl \
> graphics/glew
>
>
Re: update to coq 8.8.0 and findlib 1.8.0
> All that said, I now have a working Coq 8.8.0 installed. great! thanks, pesco. I'll try this the next weekend. btw, on MacOS with homebrew, I tried opam to install coq, just works. I wanna see coq as a opam package on OpenBSD, too... if anyone already has an experience, please advice. -- yozo.
update intel microcode to 20180425
"== 20180425 Release ==
-- Updates upon 20180312 release --
Processor Identifier Version Products
ModelStepping F-MO-S/PI Old->New
updated platforms
GLK B0 6-7a-1/01 001e->0022 Pentium Silver N/J5xxx,
Celeron N/J4xxx
removed platforms
BDX-ML B/M/R0 6-4f-1/ef 0b21 Xeon E5/E7 v4; Core
i7-69xx/68xx
-- Special release with caveats --
BDX-ML B/M/R0 6-4f-1/ef 0b2c Xeon E5/E7 v4; Core
i7-69xx/68xx"
"-- intel-ucode-with-caveats/ --
This directory holds microcode that might need special handling.
BDX-ML microcode is provided in directory, because it need special commits in
the Linux kernel, otherwise, updating it might result in unexpected system
behavior.
OS vendors must ensure that the late loader patches (provided in
linux-kernel-patches\) are included in the distribution before packaging the
BDX-ML microcode for late-loading."
Index: Makefile
===
RCS file: /cvs/ports/sysutils/firmware/intel/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile17 Mar 2018 11:38:06 - 1.5
+++ Makefile9 May 2018 04:22:34 -
@@ -2,9 +2,9 @@
FW_DRIVER= intel
-FW_VER=20180312
+FW_VER=20180425
EPOCH= 0
-MASTER_SITES= https://downloadmirror.intel.com/27591/eng/
+MASTER_SITES= https://downloadmirror.intel.com/27776/eng/
DISTNAME= microcode-${FW_VER}
@@ -15,6 +15,6 @@ EXTRACT_SUFX= .tgz
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/firmware/intel
- ${INSTALL_DATA} ${WRKDIR}/intel-ucode/* ${PREFIX}/firmware/intel
+ ${INSTALL_DATA} ${WRKDIR}/intel-ucode/*-* ${PREFIX}/firmware/intel
.include
Index: distinfo
===
RCS file: /cvs/ports/sysutils/firmware/intel/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo17 Mar 2018 11:38:06 - 1.3
+++ distinfo9 May 2018 04:17:44 -
@@ -1,2 +1,2 @@
-SHA256 (firmware/microcode-20180312.tgz) =
CzgfrOLfGwqCncT6j6k/R/OeEbHJwi69RPhhRlfB53k=
-SIZE (firmware/microcode-20180312.tgz) = 3789662
+SHA256 (firmware/microcode-20180425.tgz) =
8NJJL0Vh4lWfbJRxsjHLgmLUV2LA58zPeHvlwYm04tY=
+SIZE (firmware/microcode-20180425.tgz) = 1565473
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/firmware/intel/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 17 Mar 2018 11:38:07 - 1.4
+++ pkg/PLIST 9 May 2018 04:23:01 -
@@ -59,7 +59,6 @@ firmware/intel/06-45-01
firmware/intel/06-46-01
firmware/intel/06-47-01
firmware/intel/06-4e-03
-firmware/intel/06-4f-01
firmware/intel/06-55-03
firmware/intel/06-55-04
firmware/intel/06-56-02
[UPDATE] sysutils/sleuthkit
Hi,
attached is the diff to update sleuthkit to latest release.
PostgreSQL, libvhdi, & libvmdk are now supported, so use them.
More information:
https://github.com/sleuthkit/sleuthkit/releases/tag/sleuthkit-4.6.1
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/sleuthkit/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile 7 Apr 2018 23:15:28 - 1.24
+++ Makefile 9 May 2018 06:05:13 -
@@ -2,9 +2,8 @@
COMMENT= forensic toolkit based on TCT
-DISTNAME= sleuthkit-4.6.0
+DISTNAME= sleuthkit-4.6.1
CATEGORIES= sysutils security
-REVISION= 0
SHARED_LIBS += tsk 1.0 # 17.0
@@ -18,7 +17,8 @@ PERMIT_PACKAGE_FTP= Yes
MASTER_SITES = https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/
-WANTLIB += c m pthread ${COMPILER_LIBCXX} sqlite3 z
+WANTLIB += ${COMPILER_LIBCXX} bfio c crypto m pq sqlite3 ssl vhdi
+WANTLIB += vmdk z
CONFIGURE_STYLE = gnu
@@ -29,7 +29,10 @@ CONFIGURE_ARGS += --mandir='${PREFIX}/m
CONFIGURE_ENV = ac_cv_path_CPPUNIT_CONFIG=no
RUN_DEPENDS = converters/p5-DateManip
-LIB_DEPENDS = databases/sqlite3
+LIB_DEPENDS = databases/sqlite3 \
+ databases/postgresql,-main \
+ sysutils/libvhdi \
+ sysutils/libvmdk
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/sysutils/sleuthkit/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 14 Mar 2018 12:39:17 - 1.13
+++ distinfo 9 May 2018 06:05:13 -
@@ -1,2 +1,2 @@
-SHA256 (sleuthkit-4.6.0.tar.gz) = 9SoIqw3geBgsDy0Z0+GzQUJKngwWM6YcO4kvs4+ay5c=
-SIZE (sleuthkit-4.6.0.tar.gz) = 8634432
+SHA256 (sleuthkit-4.6.1.tar.gz) = H2jztZg6zbhxowWS+3NaMvTbk/BB/PMYvPPshxKKtDM=
+SIZE (sleuthkit-4.6.1.tar.gz) = 8642960
Index: patches/patch-tools_srchtools_sigfind_cpp
===
RCS file: patches/patch-tools_srchtools_sigfind_cpp
diff -N patches/patch-tools_srchtools_sigfind_cpp
--- patches/patch-tools_srchtools_sigfind_cpp 7 Apr 2018 23:15:28 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-tools_srchtools_sigfind_cpp,v 1.4 2018/04/07 23:15:28 nigel Exp $
-
-Index: tools/srchtools/sigfind.cpp
tools/srchtools/sigfind.cpp.orig
-+++ tools/srchtools/sigfind.cpp
-@@ -302,7 +302,7 @@ main(int argc, char **argv)
- break;
- }
- else if (retval == -1) {
--fprintf(stderr, "error reading bytes %"PRIuOFF"\n", i);
-+fprintf(stderr, "error reading bytes %" PRIuOFF "\n", i);
- exit(1);
- }
-
-@@ -312,9 +312,9 @@ main(int argc, char **argv)
- ((sig_size < 3) || (block[rel_offset + 2] == sig[2])) &&
- ((sig_size < 4) || (block[rel_offset + 3] == sig[3]))) {
- if (prev_hit == -1)
--printf("Block: %"PRIuOFF" (-)\n", i);
-+printf("Block: %" PRIuOFF " (-)\n", i);
- else
--printf("Block: %"PRIuOFF" (+%"PRIuOFF")\n", i,
-+printf("Block: %" PRIuOFF " (+%" PRIuOFF ")\n", i,
-(i - prev_hit));
-
- prev_hit = i;
Re: NEW: mail/rss2email3
On Sun, May 06 2018, Kaashif Hymabaccus wrote:
> On Mon, Apr 30, 2018 at 05:51:31PM +0200, Solene Rapenne wrote:
>>
>> a TEST_DEPENDS is needed here
>>
>>
>> A few changes are needed in pkg/PLIST too
>>
>> - remove share/doc/rss2email3/README, because the README from pkg/README
>> will be automatically put there-> share/doc/pkg-readmes/${FULLPKGNAME}
>> - ${MODPY_COMMENT} should be used for directories containing ${MODPY_PYCACHE}
>
> Made these changes. Tarball attached.
The port looks good to me, the transition path makes sense I guess...
Two questions:
1. This proposal embeds "3" in the port directory name and the PKGNAME,
what is supposed to happen with rss2email-4.0? A new mail/rss2email4
port? :)
2. Right now it's not clear to me who is upstream,
https://github.com/wking/rss2email or https://github.com/rss2email/rss2email ?
https://github.com/wking/rss2email is mentioned as upstream in the 3.9
release (2014) hosted on pypi. https://github.com/rss2email/rss2email
is mentioned as a possible new upstream in
https://github.com/wking/rss2email/issues/105
PR opened 9 days ago: https://github.com/rss2email/rss2email/issues/18
All I know is that rss2email/rss2email has two more commits than
wking/rss2email and transferred some PRs from it.
I guess it would be nice to sort this out, especially a new release
seems warranted, see for example the unreleased fix
https://github.com/wking/rss2email/commit/354543d53e1b2716a416d23614b323d5c96aeee3
https://github.com/rss2email/rss2email/commit/354543d53e1b2716a416d23614b323d5c96aeee3
Thoughts?
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: aarch64 bulk build report
On Tue, May 08, 2018 at 09:53:27PM +0200, Christian Weisgerber wrote: > phess...@openbsd.org: > > > bulk build on arm64.ports.openbsd.org > > started on Sat May 5 03:55:36 MDT 2018 > > finished at Tue May 8 11:22:53 MDT 2018 > > > > build failures: 77 > > The new #1 problem here is that g-ir-scanner segfaults. That is > fallout from the devel/gobject-introspection update during p2k18. > > -- > Christian "naddy" Weisgerber na...@mips.inka.de I lack any access to an arm64 box so I cannot really debug this myself; any more verbose logging on what's going on would thus be appreciated. -- jasper
