diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index bbecd194451..85a03b0ff01 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-6.91 +PKGNAME = quirks-6.92 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 60b8a808e9c..a838dd5432f 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1486 2023/01/03 11:40:27 sthen Exp $ +# $OpenBSD: Quirks.pm,v 1.1487 2023/01/10 19:07:55 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -1810,6 +1810,7 @@ my $obsolete_message = { 12 => "replace with IMAPSieve, see https://wiki.dovecot.org/HowTo/AntispamWithSieve", 13 => "has a dependency on obsolete software", 14 => "no longer maintained upstream and has security issues, consider remmina or tigervnc's vncviewer as an alternative", + 15 => "use rspamd's internal milter support instead", 17 => "old GeoIP databases end-of-life, see alternative using geoip2/libmaxminddb", 20 => "merged into IETF Opus codec, obsolete, audio/mumble uses bundled version now", 21 => "upstream recommends to use composer to build a drupal site", diff --git a/mail/Makefile b/mail/Makefile index 874003852d1..646c190b8e0 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -206,7 +206,6 @@ SUBDIR += rcube-yubikey-plugin SUBDIR += relaydb SUBDIR += rmail - SUBDIR += rmilter SUBDIR += roundcubemail SUBDIR += rspamd SUBDIR += rspamd,hyperscan diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile deleted file mode 100644 index fafc0d31160..00000000000 --- a/mail/rmilter/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -COMMENT= milter for rspamd (also supports clamav, rate-limiting, etc) - -GH_ACCOUNT= vstakhov -GH_PROJECT= rmilter -GH_TAGNAME= 1.10.0 -REVISION= 5 - -CATEGORIES= mail - -# BSD -PERMIT_PACKAGE= Yes - -WANTLIB += c crypto glib-2.0 intl m milter opendkim pcre pthread ssl - -COMPILER= base-clang ports-gcc -COMPILER_LANGS= c - -MODULES+= devel/cmake - -BUILD_DEPENDS= devel/bison -LIB_DEPENDS= devel/glib2 \ - devel/pcre \ - mail/sendmail,-libmilter \ - mail/opendkim - -CONFIGURE_ARGS= -DCMAKE_C_OPT_FLAGS="${CFLAGS}" \ - -DMANDIR="${TRUEPREFIX}/man" - -NO_TEST= Yes - -# no trailing crlf -post-extract: - cd ${WRKSRC}; for i in http-parser lc-btrie xxhash; \ - do echo >> contrib/$$i/CMakeLists.txt; done - -pre-configure: - sed -i -e 's,/etc/,${SYSCONFDIR}/,g' \ - -e 's,/var/,${LOCALSTATEDIR}/,g' \ - ${WRKSRC}/rmilter*conf* ${WRKSRC}/src/main.c - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rmilter - ${INSTALL_DATA} ${WRKSRC}/rmilter.conf.sample \ - ${WRKSRC}/rmilter-grey.conf \ - ${PREFIX}/share/examples/rmilter/ - -.include diff --git a/mail/rmilter/distinfo b/mail/rmilter/distinfo deleted file mode 100644 index 1e66a47cbd7..00000000000 --- a/mail/rmilter/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rmilter-1.10.0.tar.gz) = 6oBWP6djav7Qtf2aKaojAPFXk+2FeI5M5pwYfTQafVQ= -SIZE (rmilter-1.10.0.tar.gz) = 390583 diff --git a/mail/rmilter/patches/patch-CMakeLists_txt b/mail/rmilter/patches/patch-CMakeLists_txt deleted file mode 100644 index 64e389541b2..00000000000 --- a/mail/rmilter/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,18 +0,0 @@ ---- CMakeLists.txt.orig Thu Jul 7 09:06:40 2016 -+++ CMakeLists.txt Thu Jul 7 09:19:03 2016 -@@ -168,10 +168,14 @@ ENDMACRO(ProcessPackage name) - - ############################# OS SECTION ############################################# - SET(TAR "tar") --IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly") -+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE -DFREEBSD") - SET(TAR "gtar") - MESSAGE(STATUS "Configuring for FreeBSD") -+ELSEIF(CMAKE_SYSTEM_NAME MATCHES ".*BSD") -+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE") -+ SET(TAR "gtar") -+ MESSAGE(STATUS "Configuring for other BSD") - ENDIF() - IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE -DDARWIN") diff --git a/mail/rmilter/patches/patch-contrib_http-parser_CMakeLists_txt b/mail/rmilter/patches/patch-contrib_http-parser_CMakeLists_txt deleted file mode 100644 index c00ff215dd8..00000000000 --- a/mail/rmilter/patches/patch-contrib_http-parser_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/http-parser/CMakeLists.txt.orig Mon Jun 20 11:08:56 2016 -+++ contrib/http-parser/CMakeLists.txt Thu Jul 7 08:58:21 2016 -@@ -1,8 +1,4 @@ - SET(HTTPSRC http_parser.c) - --if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") -- set(HTTP_COMPILE_FLAGS "${HTTP_COMPILE_FLAGS} -O3") --endif () -- - ADD_LIBRARY(rmilter-http-parser STATIC ${HTTPSRC}) - SET_TARGET_PROPERTIES(rmilter-http-parser PROPERTIES COMPILE_FLAGS "${HTTP_COMPILE_FLAGS}") diff --git a/mail/rmilter/patches/patch-contrib_lc-btrie_CMakeLists_txt b/mail/rmilter/patches/patch-contrib_lc-btrie_CMakeLists_txt deleted file mode 100644 index 1e5e5e50a72..00000000000 --- a/mail/rmilter/patches/patch-contrib_lc-btrie_CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ ---- contrib/lc-btrie/CMakeLists.txt.orig Fri Dec 2 14:44:00 2016 -+++ contrib/lc-btrie/CMakeLists.txt Fri Dec 2 14:44:00 2016 -@@ -3,7 +3,4 @@ SET(LCTRIESRC btrie.c - ADD_LIBRARY(lcbtrie STATIC ${LCTRIESRC}) - - SET(LCTRIE_CFLAGS "-DBUILD_RSPAMD") --if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") -- SET(LCTRIE_CFLAGS "${LCTRIE_CFLAGS} -O3") --endif () - set_target_properties(lcbtrie PROPERTIES COMPILE_FLAGS "${LCTRIE_CFLAGS}") diff --git a/mail/rmilter/patches/patch-contrib_xxhash_CMakeLists_txt b/mail/rmilter/patches/patch-contrib_xxhash_CMakeLists_txt deleted file mode 100644 index 8de347acd4e..00000000000 --- a/mail/rmilter/patches/patch-contrib_xxhash_CMakeLists_txt +++ /dev/null @@ -1,9 +0,0 @@ ---- contrib/xxhash/CMakeLists.txt.orig Mon Jun 20 11:08:56 2016 -+++ contrib/xxhash/CMakeLists.txt Thu Jul 7 08:58:21 2016 -@@ -1,6 +1,3 @@ - SET(XXHASHSRC xxhash.c) - --if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") --endif () - ADD_LIBRARY(xxhash STATIC ${XXHASHSRC}) diff --git a/mail/rmilter/patches/patch-contrib_zstd_CMakeLists_txt b/mail/rmilter/patches/patch-contrib_zstd_CMakeLists_txt deleted file mode 100644 index d25337753d9..00000000000 --- a/mail/rmilter/patches/patch-contrib_zstd_CMakeLists_txt +++ /dev/null @@ -1,9 +0,0 @@ ---- contrib/zstd/CMakeLists.txt.orig Fri Dec 2 14:41:33 2016 -+++ contrib/zstd/CMakeLists.txt Fri Dec 2 14:41:42 2016 -@@ -12,6 +12,3 @@ SET(ZSTDSRC divsufsort.c - zstd_decompress.c) - - ADD_LIBRARY(rmilter-zstd STATIC ${ZSTDSRC}) --if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") -- SET_TARGET_PROPERTIES(rmilter-zstd PROPERTIES COMPILE_FLAGS "-O3") --endif () diff --git a/mail/rmilter/patches/patch-hiredis_CMakeLists_txt b/mail/rmilter/patches/patch-hiredis_CMakeLists_txt deleted file mode 100644 index f5e5a1fda32..00000000000 --- a/mail/rmilter/patches/patch-hiredis_CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ ---- hiredis/CMakeLists.txt.orig Mon Sep 12 13:03:58 2016 -+++ hiredis/CMakeLists.txt Mon Sep 19 19:58:37 2016 -@@ -6,9 +6,6 @@ SET(HIREDISSRC async.c - sds.c) - - SET(HIREDIS_CFLAGS "") --IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") -- SET(HIREDIS_CFLAGS "${HIREDIS_CFLAGS} -O3") --ENDIF() - - ADD_LIBRARY(rmilter-hiredis STATIC ${HIREDISSRC}) - diff --git a/mail/rmilter/patches/patch-rmilter_conf_sample b/mail/rmilter/patches/patch-rmilter_conf_sample deleted file mode 100644 index e35f7c79906..00000000000 --- a/mail/rmilter/patches/patch-rmilter_conf_sample +++ /dev/null @@ -1,19 +0,0 @@ ---- rmilter.conf.sample.orig Fri Nov 18 14:55:03 2016 -+++ rmilter.conf.sample Sat Nov 19 16:20:58 2016 -@@ -280,7 +280,7 @@ dkim { - - # Universal selector, keys will be checked for pattern /etc/dkim/..key - domain { -- key = /usr/local/etc/dkim; -+ key = /etc/dkim; - domain = "*"; - selector = "dkim"; - }; -@@ -291,5 +291,5 @@ dkim { - - - # include user's configuration, replace this with full path --.try_include /usr/local/etc/rmilter.conf.local --.try_include /usr/local/etc/rmilter.conf.d/*.conf -+.try_include /etc/rmilter/rmilter.conf.local -+.try_include /etc/rmilter/rmilter.conf.d/*.conf diff --git a/mail/rmilter/patches/patch-src_radix_c b/mail/rmilter/patches/patch-src_radix_c deleted file mode 100644 index 1c2f2998e7a..00000000000 --- a/mail/rmilter/patches/patch-src_radix_c +++ /dev/null @@ -1,14 +0,0 @@ -Fix return value (invalid conversion from pointer to integer) - -Index: src/radix.c ---- src/radix.c.orig -+++ src/radix.c -@@ -55,7 +55,7 @@ radix_insert_compressed (radix_compressed_t * tree, - int ret; - - if (tree == NULL) { -- return NULL; -+ return RADIX_NO_VALUE; - } - - g_assert (keybits >= masklen); diff --git a/mail/rmilter/patches/patch-src_upstream_c b/mail/rmilter/patches/patch-src_upstream_c deleted file mode 100644 index 411b7d91f37..00000000000 --- a/mail/rmilter/patches/patch-src_upstream_c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/upstream.c.orig Fri Dec 2 14:42:42 2016 -+++ src/upstream.c Fri Dec 2 14:43:17 2016 -@@ -226,7 +226,7 @@ get_random_upstream(void *ups, unsigned int members, u - - alive = rescan_upstreams (ups, members, msize, now, error_timeout, - revive_timeout, max_errors, priv); -- selected = rand () % alive; -+ selected = arc4random_uniform (alive); - msg_debug("<%s>; get_random_upstream: return upstream with number %d of %d", - priv->mlfi_id, selected, alive); - diff --git a/mail/rmilter/pkg/DESCR b/mail/rmilter/pkg/DESCR deleted file mode 100644 index efda7c54720..00000000000 --- a/mail/rmilter/pkg/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -Obsolete software to integrate rspamd with any milter-compatible MTA, for -example postfix or sendmail. - -Do not use rmilter in new projects. You should work to move existing -installations across to rspamd's integrated milter support. - -This package is being maintained in the short time to ease transition, -but will be removed. diff --git a/mail/rmilter/pkg/PLIST b/mail/rmilter/pkg/PLIST deleted file mode 100644 index 7d607233065..00000000000 --- a/mail/rmilter/pkg/PLIST +++ /dev/null @@ -1,10 +0,0 @@ -@newgroup _rmilter:783 -@newuser _rmilter:783:_rmilter::rmilter user:/nonexistent:/sbin/nologin -@bin sbin/rmilter -share/examples/rmilter/ -share/examples/rmilter/rmilter-grey.conf -@sample ${SYSCONFDIR}/rmilter/ -@sample ${SYSCONFDIR}/rmilter/rmilter-grey.conf -share/examples/rmilter/rmilter.conf.sample -@sample ${SYSCONFDIR}/rmilter/rmilter.conf -@rcscript ${RCDIR}/rmilter diff --git a/mail/rmilter/pkg/rmilter.rc b/mail/rmilter/pkg/rmilter.rc deleted file mode 100644 index 00a4baa8d27..00000000000 --- a/mail/rmilter/pkg/rmilter.rc +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/ksh - -daemon="${TRUEPREFIX}/sbin/rmilter" -daemon_flags="-c ${SYSCONFDIR}/rmilter/rmilter.conf" -daemon_user="_rmilter" - -. /etc/rc.d/rc.subr - -rc_reload_signal=USR1 - -rc_pre() { - /usr/bin/install -d -o ${daemon_user} /var/run/rmilter -} - -rc_cmd $1