cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove rmilter, it is obsolete since rspamd gained built-in milter

Browse Source 
support (it was kept during transition, but there has been plenty
of time for that now)
This commit is contained in:
sthen 2023-01-10 19:07:54 +00:00
parent 718be0c542
commit 239521d9bf
17 changed files with 3 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/quirks/Makefile
View File

@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-6.91
PKGNAME = quirks-6.92
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -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 <espie@openbsd.org>
#
@ -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",

1
mail/Makefile
View File

@ -206,7 +206,6 @@
SUBDIR += rcube-yubikey-plugin
SUBDIR += relaydb
SUBDIR += rmail
SUBDIR += rmilter
SUBDIR += roundcubemail
SUBDIR += rspamd
SUBDIR += rspamd,hyperscan

47
mail/rmilter/Makefile
View File

@ -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 <bsd.port.mk>

2
mail/rmilter/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (rmilter-1.10.0.tar.gz) = 6oBWP6djav7Qtf2aKaojAPFXk+2FeI5M5pwYfTQafVQ=
SIZE (rmilter-1.10.0.tar.gz) = 390583

18
mail/rmilter/patches/patch-CMakeLists_txt
View File

@ -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")

11
mail/rmilter/patches/patch-contrib_http-parser_CMakeLists_txt
View File

@ -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}")

10
mail/rmilter/patches/patch-contrib_lc-btrie_CMakeLists_txt
View File

@ -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}")

9
mail/rmilter/patches/patch-contrib_xxhash_CMakeLists_txt
View File

@ -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})

9
mail/rmilter/patches/patch-contrib_zstd_CMakeLists_txt
View File

@ -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 ()

12
mail/rmilter/patches/patch-hiredis_CMakeLists_txt
View File

@ -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})

19
mail/rmilter/patches/patch-rmilter_conf_sample
View File

@ -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/<domain>.<selector>.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

14
mail/rmilter/patches/patch-src_radix_c
View File

@ -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);

11
mail/rmilter/patches/patch-src_upstream_c
View File

@ -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);

8
mail/rmilter/pkg/DESCR
View File

@ -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.

10
mail/rmilter/pkg/PLIST
View File

@ -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

15
mail/rmilter/pkg/rmilter.rc
View File

@ -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