CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2018/12/22 22:03:07 Modified files: news/sabnzbd : Makefile distinfo Removed files: news/sabnzbd/patches: patch-sabnzbd_assembler_py Log message: Update to sabnzbd-2.3.6. As discussed with mglocker@ take over maintainership. OK mglocker@
Re: No php.conf in 6.4
On Fri, Dec 21, 2018 at 4:58 PM Stuart Henderson wrote: > You'll find the sample Apache config in the php-apache packages. > > I think most people on OpenBSD are using web servers that use fastcgi (via > php-fpm) such as nginx or the httpd in OpenBSD base. Typically most > documentation in the ports tree is mainly aimed at these. > > Thanks that tip got me there! root $ pkg_info -Q php ... php-5.6.38p0 php-7.0.32p1 (installed) php-7.1.22 (installed) php-7.2.10 (installed) php-apache-5.6.38 php-apache-7.0.32p1 php-apache-7.1.22 php-apache-7.2.10 ... root $ pkg_add php-apache-7.2.10 root $ ln -sf /var/www/conf/modules.sample/php-7.2.conf /var/www/conf/modules/php.conf root $ apachectl restart [Fri Dec 21 17:13:15.759810 2018] [php7:crit] [pid 9864:tid 17193615307040] Apache is running a threaded MPM, but your PHP Module is not compiled to be threadsafe. You need to recompile PHP. AH00013: Pre-configuration failed # edited the apache httpd.conf to swap these two; comment the first and uncomment the second: #LoadModule mpm_event_module /usr/local/lib/apache2/mod_mpm_event.so LoadModule mpm_prefork_module /usr/local/lib/apache2/mod_mpm_prefork.so apache started and nagios runs. Thanks! Mike
[NEW] devel/ripes-1.0.2
Ripes is a graphical 5-stage processor pipeline simulator and assembly code editor built for the RISC-V instruction set architecture, suitable for teaching how assembly level code is executed on a classic pipelined architecture. Ripes is especially suitable for illustrating how concepts such as forwarding and stalling works, giving a visual representation of both cases. Seems to build and run fine on AMD64. ~ Charles ripes.tar.gz Description: application/compressed-tar
[UPDATE] net/prosody to 0.11.1
Hey,
attached patch updates prosody to 0.11.1.
Quite a bit of changes in this one, most noticeably:
- prosody now ships with BSD Makefiles, so we can drop gmake.
- The patch for util-src/makefile is required until the next release,
as a fix was committed upstream[2].
- Lua 5.1 is still supported for now, at some point 5.2 will be
mandatory.
- I have disabled the tests for now, as they now require busted and
luacheck, of which busted has not been ported yet. Also, they were
broken before. Though it'd obviously be great to have them back at
some point.
[1]: https://prosody.im/doc/packagers#section011
[2]: https://issues.prosody.im/1251
Feedback? OK?
Best regards
Henrik
Index: Makefile
===
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile4 Sep 2018 12:46:18 - 1.51
+++ Makefile22 Dec 2018 22:05:04 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.51 2018/09/04 12:46:18 espie Exp $
COMMENT= communications server for Jabber/XMPP written in Lua
-DISTNAME= prosody-0.10.2
-REVISION= 1
+DISTNAME= prosody-0.11.1
CATEGORIES=net
MASTER_SITES= http://prosody.im/downloads/source/
@@ -13,7 +12,7 @@ MAINTAINER= Henrik Friedrichsen
Index: distinfo
===
RCS file: /cvs/ports/net/prosody/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo4 Jun 2018 19:53:58 - 1.15
+++ distinfo22 Dec 2018 22:05:04 -
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.10.2.tar.gz) = dbXwNeenTV8gju6vhBm5SoXQm0AlLURM/4Az/ePJdo4=
-SIZE (prosody-0.10.2.tar.gz) = 331874
+SHA256 (prosody-0.11.1.tar.gz) = kb7EPweYcp4KKyB2E6dFWY6jyn3Lf9hd9EzPBPpcZao=
+SIZE (prosody-0.11.1.tar.gz) = 418780
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 3 Apr 2015 15:23:57 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2015/04/03 15:23:57 edd Exp $
Makefile.orig Tue Mar 24 20:18:04 2015
-+++ Makefile Wed Apr 1 21:06:56 2015
-@@ -1,12 +1,12 @@
-
- include config.unix
-
--BIN = $(DESTDIR)$(PREFIX)/bin
-+BIN = $(DESTDIR)$(PREFIX)/sbin
- CONFIG = $(DESTDIR)$(SYSCONFDIR)
- MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
- SOURCE = $(DESTDIR)$(LIBDIR)/prosody
- DATA = $(DESTDIR)$(DATADIR)
--MAN = $(DESTDIR)$(PREFIX)/share/man
-+MAN = $(DESTDIR)$(PREFIX)/man
-
- INSTALLEDSOURCE = $(LIBDIR)/prosody
- INSTALLEDCONFIG = $(SYSCONFDIR)
Index: patches/patch-certs_Makefile
===
RCS file: patches/patch-certs_Makefile
diff -N patches/patch-certs_Makefile
--- patches/patch-certs_Makefile5 Nov 2017 16:52:07 - 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-$OpenBSD: patch-certs_Makefile,v 1.7 2017/11/05 16:52:07 landry Exp $
-Index: certs/Makefile
certs/Makefile.orig
-+++ certs/Makefile
-@@ -2,13 +2,13 @@
- keysize=2048
-
- # How to:
--# First, `make yourhost.cnf` which creates a openssl config file.
-+# First, `${MAKE_PROGRAM} yourhost.cnf` which creates a openssl config file.
- # Then edit this file and fill in the details you want it to have,
- # and add or change hosts and components it should cover.
--# Then `make yourhost.key` to create your private key, you can
-+# Then `${MAKE_PROGRAM} yourhost.key` to create your private key, you can
- # include keysize=number to change the size of the key.
--# Then you can either `make yourhost.csr` to generate a certificate
--# signing request that you can submit to a CA, or `make yourhost.crt`
-+# Then you can either `${MAKE_PROGRAM} yourhost.csr` to generate a certificate
-+# signing request that you can submit to a CA, or `${MAKE_PROGRAM}
yourhost.crt`
- # to generate a self signed certificate.
-
- .PRECIOUS: %.cnf %.key
-@@ -60,6 +60,8 @@ keysize=2048
- %.key:
- umask 0077 && openssl genrsa -out $@ $(keysize)
- @chmod 400 $@
-+ @chown _prosody $@ || \
-+ echo "***WARNING***: You will need to 'chown _prosody $@'"
-
- # Generate Diffie-Hellman parameters
- dh-%.pem:
Index: patches/patch-certs_makefile
===
RCS file: patches/patch-certs_makefile
diff -N patches/patch-certs_makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-certs_makefile22 Dec 2018 22:05:04 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: certs/makefile
+--- certs/makefile.orig
certs/makefile
+@@ -14,5 +14,7 @@ keysize=2048
+ ${.TARGETS:M*.crt}:
+ openssl req -new -x509 -newkey rsa:$(keysize) -nodes -keyout
${.TARGET:R}.key \
+ -days 365 -sha256 -out $@ -utf8 -subj /CN=${.TARGET:R}
++ @chown _prosody $@ || \
++ echo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2018/12/22 13:26:27 Modified files: mail/kopano/core: distinfo Log message: fix distinfo bceause of a re-rolled tarball
Re: UPDATE: x11/herbstluftwm-0.7.0 -> 0.7.1
On 21/12/2018 12:52, Sascha Paunovic wrote: Hi, here's an update of herbstluftwm to 0.7.1. I no longer use OpenBSD on a desktop, so I am not really anyone to give an "ok" on this. But for what it's worth you have it anyway. Florian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2018/12/22 10:55:23 Modified files: mail/kopano/webapp: Makefile distinfo mail/kopano/webapp/pkg: PLIST Log message: update to 3.5.1.2047
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2018/12/22 10:49:21 Modified files: security/gnupg2: Makefile distinfo Log message: Update to 2.2.12 ok ajacoutot@, lum@, abieber@
zabbix 4.0.3
Hi,
the following diff updates net/zabbix to 4.0.3.
See https://www.zabbix.com/rn/rn4.0.3 for fixed bugs/new features.
Runs fine here on amd64
Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile12 Dec 2018 13:34:31 - 1.156
+++ Makefile20 Dec 2018 17:00:52 -
@@ -5,7 +5,7 @@ COMMENT-server =network and application
COMMENT-proxy =network and application monitoring - proxy
COMMENT-web = network and application monitoring - web frontend
-VERSION = 4.0.0
+VERSION = 4.0.3
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@@ -15,8 +15,6 @@ FULLPKGPATH-proxy = net/zabbix,-proxy
FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
-REVISION-main =0
-REVISION-web = 0
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
Index: distinfo
===
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo26 Oct 2018 06:57:21 - 1.45
+++ distinfo20 Dec 2018 17:00:52 -
@@ -1,2 +1,2 @@
-SHA256 (zabbix-4.0.0.tar.gz) = VnPhBhVhAq/4xngaiQ2mzt/Jdc8T2W2HSbTHEm9Ca8c=
-SIZE (zabbix-4.0.0.tar.gz) = 17984379
+SHA256 (zabbix-4.0.3.tar.gz) = az07I8cqevGVjcCTilZr4D8EJMtE31sqn0h0KPMtBGM=
+SIZE (zabbix-4.0.3.tar.gz) = 18019170
Index: patches/patch-conf_zabbix_server_conf
===
RCS file: /cvs/ports/net/zabbix/patches/patch-conf_zabbix_server_conf,v
retrieving revision 1.10
diff -u -p -r1.10 patch-conf_zabbix_server_conf
--- patches/patch-conf_zabbix_server_conf 26 Oct 2018 06:57:21 -
1.10
+++ patches/patch-conf_zabbix_server_conf 20 Dec 2018 17:00:52 -
@@ -12,15 +12,15 @@ Index: conf/zabbix_server.conf
### Option: LogFileSize
# Maximum size of log file in MB.
-@@ -124,6 +124,7 @@ DBUser=zabbix
+@@ -123,6 +123,7 @@ DBUser=zabbix
# Mandatory: no
# Default:
# DBSocket=
+DBSocket=/var/www/var/run/mysql/mysql.sock
### Option: DBPort
- # Database port when not using local socket. Ignored for SQLite.
-@@ -506,6 +507,7 @@ Timeout=4
+ # Database port when not using local socket.
+@@ -504,6 +505,7 @@ Timeout=4
# Mandatory: no
# Default:
# AlertScriptsPath=${datadir}/zabbix/alertscripts
@@ -28,7 +28,7 @@ Index: conf/zabbix_server.conf
### Option: ExternalScripts
# Full path to location of external scripts.
-@@ -523,6 +525,7 @@ Timeout=4
+@@ -521,6 +523,7 @@ Timeout=4
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
@@ -36,7 +36,7 @@ Index: conf/zabbix_server.conf
### Option: Fping6Location
# Location of fping6.
-@@ -532,6 +535,7 @@ Timeout=4
+@@ -530,6 +533,7 @@ Timeout=4
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/zabbix/patches/patch-configure,v
retrieving revision 1.23
diff -u -p -r1.23 patch-configure
--- patches/patch-configure 26 Oct 2018 06:57:21 - 1.23
+++ patches/patch-configure 20 Dec 2018 17:00:52 -
@@ -28,7 +28,7 @@ Index: configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
-@@ -12500,12 +12501,12 @@ LIBS="$LIBS $ICONV_LIBS"
+@@ -12512,12 +12513,12 @@ LIBS="$LIBS $ICONV_LIBS"
RANLIB="ranlib"
Index: patches/patch-src_libs_zbxcrypto_tls_c
===
RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxcrypto_tls_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libs_zbxcrypto_tls_c
--- patches/patch-src_libs_zbxcrypto_tls_c 12 Aug 2018 13:25:53 -
1.1
+++ patches/patch-src_libs_zbxcrypto_tls_c 20 Dec 2018 17:00:52 -
@@ -36,7 +36,17 @@ Index: src/libs/zbxcrypto/tls.c
static void OPENSSL_cleanup(void)
{
-@@ -1419,6 +1422,7 @@ static unsigned int zbx_psk_client_cb(SSL *ssl,
const
+@@ -229,7 +232,9 @@ ZBX_THREAD_LOCAL static size_t
psk_len_for_cb = 0;
+ static intinit_done = 0;
+ /* variables for capturing PSK identity from server callback function */
+ ZBX_THREAD_LOCAL static int incoming_connection_has_psk = 0;
++#ifndef OPENSSL_NO_PSK
+ ZBX_THREAD_LOCAL static char
incoming_connection_psk_id[PSK_MAX_IDENTITY_LEN + 1];
++#endif
+ /* buffer for messages produced by zbx_openssl_info_cb() */
+ ZBX_THREAD_LOCAL char info_buf[256];
+ #endif
+@@ -1443,6 +1448,7
NEW: net/spoofer-1.4.2
The CAIDA Spoofer project measures the Internet's susceptibility to spoofed source address IP packets. The Spoofer client attempts to send a series of spoofed UDP packets that test the ability to send different classes of spoofed traffic http://spoofer.caida.org/ spoofer.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2018/12/22 05:17:49 Modified files: mail/kopano: Makefile.inc mail/kopano/core: Makefile distinfo mail/kopano/core/pkg: PLIST-main Log message: update to 8.7.80.355
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2018/12/22 05:07:24 Modified files: net/mattermost-server: Makefile distinfo net/mattermost-server/pkg: PLIST Log message: update to 5.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2018/12/22 04:33:48 Modified files: x11/mate/notification-daemon: Makefile distinfo x11/mate/notification-daemon/pkg: PLIST Log message: update to 1.20.2
Re: qtbase-5.9.6p1 fails to build on -stable/loongson
On Fri, Dec 21 2018, Xiyue Deng wrote: [...] >> Index: elf64-mips.c >> === >> RCS file: /cvs/src/gnu/usr.bin/binutils-2.17/bfd/elf64-mips.c,v >> retrieving revision 1.1.1.1 >> diff -u -p -p -u -r1.1.1.1 elf64-mips.c >> --- elf64-mips.c 24 Apr 2011 20:14:42 - 1.1.1.1 >> +++ elf64-mips.c 19 Dec 2018 17:22:29 - >> @@ -2252,6 +2252,8 @@ mips_elf64_rtype_to_howto (unsigned int >> return _elf64_howto_table_rel[r_type - R_MIPS16_min]; >> } >>BFD_ASSERT (r_type < (unsigned int) R_MIPS_max); >> + if (!(r_type < (unsigned int) R_MIPS_max)) >> + fprintf(stderr, "BFD:%s: relocation type %u\n", __func__, r_type); >>if (rela_p) >> return _elf64_howto_table_rela[r_type]; >>else > > With the patch from Jeremie applied, the error message shows exact type > of relocation: > > > --8<-- > /usr/bin/ld: BFD 2.17 assertion fail > /usr/src/gnu/usr.bin/binutils-2.17/bfd/elf64-mips.c:2254 > BFD:mips_elf64_rtype_to_howto: relocation type 248 > /usr/bin/ld: BFD 2.17 internal error, aborting at > /usr/src/gnu/usr.bin/binutils-2.17/bfd/reloc.c line 445 in bfd_get_reloc_size > > /usr/bin/ld: Please report this bug. > > clang-6.0: error: linker command failed with exit code 1 (use -v to see > invocation) > -->8-- > > Hope this is helpful for MIPS people to properly fix this. This is consistent with visa@'s analysis. He committed a fix, which should arrive on your local CVS mirror soonish: --8<-- CVSROOT:/cvs Module name:src Changes by: v...@cvs.openbsd.org2018/12/22 03:31:01 Modified files: gnu/usr.bin/binutils-2.17/bfd: elf64-mips.c Log message: Add support for R_MIPS_PC32 relocation. It is needed for linking code that has been compiled using clang. The added code is based on old binutils code from year 2000. Prodded by and OK jca@, OK kettenis@ guenther@ -->8-- You could backport it to -stable, but better use -current. ;) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2018/12/22 03:35:17 Modified files: www/kore : Makefile distinfo Log message: Update kore to 3.2.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/12/22 02:39:03 Modified files: lang/freehdl : Makefile lang/freehdl/patches: patch-kernel_fhdl_stream_cc Added files: lang/freehdl/patches: patch-vaul_pool_cc Log message: Missing includes for ports-gcc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: piro...@cvs.openbsd.org 2018/12/22 02:35:30 Modified files: math/gnuplot : Makefile distinfo math/gnuplot/patches: patch-configure patch-src_command_c Log message: Update math/gnuplot to 5.2.5. Here is a minor update to gnuplot. http://www.gnuplot.info/ReleaseNotes_5_2_5.html Contains new features and a couple of bug fixes. OK ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/12/22 01:02:30 Added files: mail/geary/patches: patch-src_client_application_geary-controller_vala Log message: Unbreak with new vala (upstream).
