Debianization fix

CMakeLists.txt

@@ -3,7 +3,7 @@
 PROJECT(rmilter C)
 
 SET(RMILTER_VERSION_MAJOR 1)
-SET(RMILTER_VERSION_MINOR 9)
+SET(RMILTER_VERSION_MINOR 10)
 SET(RMILTER_VERSION_PATCH 0)
 
 IF(GIT_ID)
@@ -39,7 +39,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
 OPTION(ENABLE_DEBUG        "Enable debug output [default: OFF]"              OFF)
 OPTION(ENABLE_OPTIMIZATION "Enable optimization [default: OFF]"              OFF)
 OPTION(ENABLE_DKIM         "Enable dkim signatures [default: ON]"           ON)
-OPTION(ENABLE_MEMCACHED    "Enable memcached storage [default: ON]"         ON)
+OPTION(ENABLE_MEMCACHED    "Enable memcached storage [default: OFF]"         OFF)
 OPTION(WANT_SYSTEMD_UNITS  "Install systemd unit files on Linux [default: OFF]" OFF)
 
 ############################# INCLUDE SECTION #############################################
@@ -330,7 +330,6 @@ CHECK_INCLUDE_FILES(inttypes.h  HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILES(endian.h  HAVE_ENDIAN_H)
 CHECK_INCLUDE_FILES(sys/endian.h  HAVE_SYS_ENDIAN_H)
 CHECK_INCLUDE_FILES(machine/endian.h  HAVE_MACHINE_ENDIAN_H)
-CHECK_INCLUDE_FILES(sys/queue.h  HAVE_SYS_QUEUE_H)
 CHECK_INCLUDE_FILES(sys/socket.h  HAVE_SYS_SOCKET_H)
 CHECK_INCLUDE_FILES(sys/mman.h  HAVE_SYS_MMAN_H)
 CHECK_INCLUDE_FILES(sys/un.h  HAVE_SYS_UN_H)
@@ -353,7 +352,7 @@ IF(HAVE_SYS_SENDFILE_H)
 	CHECK_SYMBOL_EXISTS(sendfile sys/sendfile.h HAVE_SENDFILE)
 ELSE()
 	# BSD version
-	CHECK_SYMBOL_EXISTS(sendfile sys/types.h;sys/socket.h;sys/uio.h HAVE_SENDFILE)
+	CHECK_SYMBOL_EXISTS(sendfile "sys/types.h;sys/socket.h;sys/uio.h" HAVE_SENDFILE)
 ENDIF()
 CHECK_SYMBOL_EXISTS(mkstemp unistd.h HAVE_MKSTEMP)
 CHECK_SYMBOL_EXISTS(PATH_MAX limits.h HAVE_PATH_MAX)
@@ -364,10 +363,10 @@ CHECK_SYMBOL_EXISTS(MAP_NOCORE sys/mman.h HAVE_MMAP_NOCORE)
 
 ProcessPackage(OPENSSL LIBRARY crypto INCLUDE err.h INCLUDE_SUFFIXES include/openssl
 	ROOT ${OPENSSL_ROOT_DIR} MODULES openssl)
-ProcessPackage(PCRE LIBRARY pcre INCLUDE pcre.h INCLUDE_SUFFIXES include/pcre
-	ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
 ProcessPackage(LIBMILTER LIBRARY milter INCLUDE mfapi.h INCLUDE_SUFFIXES include/libmilter
 	LIB_SUFFIXES lib/libmilter ROOT ${LIBMILTER_ROOT_DIR} MODULES libmilter)
+ProcessPackage(PCRE LIBRARY pcre INCLUDE pcre.h INCLUDE_SUFFIXES include/pcre
+	ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
 ProcessPackage(GLIB2 LIBRARY glib-2.0 INCLUDE glib.h
 	INCLUDE_SUFFIXES include/glib
 	ROOT ${GLIB_ROOT_DIR} MODULES glib-2.0>=2.28)
@@ -391,16 +390,19 @@ ENDIF()
 ################################ SOURCES SECTION ###########################
 ADD_SUBDIRECTORY(hiredis)
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/hiredis")
+INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/lc-btrie")
+INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/")
 ADD_SUBDIRECTORY(contrib/libucl)
 ADD_SUBDIRECTORY(contrib/http-parser)
 ADD_SUBDIRECTORY(contrib/xxhash)
+ADD_SUBDIRECTORY(contrib/lc-btrie)
+ADD_SUBDIRECTORY(contrib/zstd)
 
 SET(RMILTERSRC
                 compat/blake2b-ref.c
                 src/upstream.c
                 src/util.c
                 src/radix.c
-                src/regexp.c
                 src/cache.c
                 ${CMAKE_BINARY_DIR}/cfg_lex.c
                 ${CMAKE_BINARY_DIR}/cfg_yacc.c
@@ -423,6 +425,8 @@ TARGET_LINK_LIBRARIES(rmilter rmilter-hiredis)
 TARGET_LINK_LIBRARIES(rmilter ucl)
 TARGET_LINK_LIBRARIES(rmilter xxhash)
 TARGET_LINK_LIBRARIES(rmilter rmilter-http-parser)
+TARGET_LINK_LIBRARIES(rmilter lcbtrie)
+TARGET_LINK_LIBRARIES(rmilter rmilter-zstd)
 
 ##################### INSTALLATION ##########################################
 
@@ -437,5 +441,4 @@ ADD_CUSTOM_TARGET(dist ${CMAKE_SOURCE_DIR}/dist.sh
 # systemd unit
 IF(WANT_SYSTEMD_UNITS MATCHES "ON")
 	INSTALL(FILES "rmilter.service" DESTINATION ${SYSTEMDDIR})
-	INSTALL(FILES "rmilter.socket" DESTINATION ${SYSTEMDDIR})
 ENDIF()

ChangeLog

@@ -1,3 +1,26 @@
+1.9.2:
+	* [Feature] Allow adding/overriding options for rmilter
+	* [Feature] Allow to disable dkim signing completely
+	* [Fix] Allow empty sections in the config
+	* [Fix] Do not fold dkim signature received from Rspamd
+	* [Fix] Fix adding headers from rspamd
+	* [Fix] Fix adding of IP addresses to the lists
+	* [Fix] Treat connections from unix socket as local connections
+	* [Fix] Unbroke 'spamd_greylist = no' config option
+	* [Rework] Process all flag config file options in same way
+	* [Rework] Remove old and deprecated rules
+	* [Rework] Use lc-btrie code for radix trie
+
+1.9.1:
+	* [Feature] Allow to disable greylisting and ratelimit globally
+	* [Feature] Optimize sending data to rspamd
+	* [Fix] Avoid using of LTS as it seems to be broken on FreeBSD
+	* [Fix] Fix detection of sendfile on FreeBSD
+	* [Fix] Fix probability setup
+	* [Fix] Fix sdsnewlen usage
+	* [Fix] Fix usage of magic constants
+	* [Rework] Remove systemd socket activation
+
 1.9.0:
 	* [CritFix] Fix spam scan
 	* [Feature] Add .try_include macro

centos/80-rmilter.preset

@@ -0,0 +1 @@
+enable rmilter.service

centos/rmilter.conf

@@ -2,5 +2,4 @@
 
 .include /etc/rmilter/rmilter.conf.common 
 
-# rmilter is socket-activated under systemd
-bind_socket = fd:3;
+bind_socket = unix:/var/run/rmilter/rmilter.sock;

centos/rmilter.conf.common

@@ -206,40 +206,13 @@ limits {
 	limit_to_ip_from = 100:0.033333333;
 };
 
-beanstalk {
-	# List of beanstalk servers, random selected
-	#servers = bot01.example.com:3132;
-
-	# Address of server to which rmilter should send all messages copies
-	#copy_server = somehost:13333;
-
-	# Address of server to which rmilter should send spam messages copies
-	#spam_server = otherhost:13333;
-
-	# Beanstalk protocol
-	protocol = tcp;
-	# Time to live for task in seconds
-	lifetime = 172800;
-	# Regexp that define for which messages we should put the whole message to beanstalk
-	# now only In-Reply-To headers are checked
-	id_regexp = "/^SomeID.*$/";
-	# Flags for sending beanstalk copies
-	send_beanstalk_headers = yes;
-	send_beanstalk_copy = yes;
-	send_beanstalk_spam = yes;
-};
-
 greylisting {
 	timeout = 300s;
 	expire = 3d;
 	whitelist = 127.0.0.1, 
 				192.168.1.1,
 				192.168.2.0/24,
 				[::1]/128;
-	awl_enable = yes;
-	awl_pool = 10M;
-	awl_hits = 10;
-	awl_ttl = 3600s;
 };
 
 dkim {

centos/rmilter.spec

@@ -2,6 +2,10 @@
 %define rmilter_group     adm
 %define rmilter_home      %{_localstatedir}/run/rmilter
 
+%define has_systemd       1
+%{?el6:%undefine has_systemd}
+%{?!suse_version:%define not_suse 1}
+
 Name:           rmilter
 Version:        1.7.0
 Release:        1
@@ -17,14 +21,12 @@ License:        BSD2c
 %endif
 URL:            https://github.com/vstakhov/rmilter
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
-%if 0%{?suse_version}
-BuildRequires:  bison,flex
-%else
+%if 0%{?not_suse}
 BuildRequires:  sendmail-milter
 %endif
 BuildRequires:  sendmail-devel,openssl-devel,pcre-devel,glib2-devel
-BuildRequires:  cmake
-%if 0%{?suse_version} || 0%{?el7} || 0%{?fedora}
+BuildRequires:  cmake,bison,flex,libopendkim-devel
+%if 0%{?has_systemd}
 BuildRequires:  systemd
 Requires(pre):  systemd
 Requires(post): systemd
@@ -50,6 +52,7 @@ Source0:    https://rspamd.com/downloads/%{name}-%{version}.tar.xz
 Source1:	%{name}.conf
 Source2:	%{name}.conf.common
 Source3:	%{name}.conf.sysvinit
+Source5:	80-rmilter.preset
 
 %description
 The rmilter utility is designed to act as milter for sendmail and postfix MTA.
@@ -66,11 +69,11 @@ rm -rf %{buildroot} || true
         -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCONFDIR=%{_sysconfdir}/rmilter \
         -DMANDIR=%{_mandir} \
-%if 0%{?el6}
-        -DWANT_SYSTEMD_UNITS=OFF \
-%else
+%if 0%{?has_systemd}
         -DWANT_SYSTEMD_UNITS=ON \
         -DSYSTEMDDIR=%{_unitdir} \
+%else
+        -DWANT_SYSTEMD_UNITS=OFF \
 %endif
 %if 0%{?suse_version}
         -DCMAKE_SKIP_INSTALL_RPATH=ON \
@@ -91,6 +94,8 @@ rm -rf %{buildroot} || true
 %if 0%{?el6}
 %{__install} -p -D -m 0755 %{SOURCE4} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -d -m 0755 %{buildroot}%{rmilter_home}
+%else
+%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_presetdir}/80-rmilter.preset
 %endif
 %{__install} -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/rmilter.conf.d/
 
@@ -104,18 +109,17 @@ rm -rf %{buildroot}
 
 %if 0%{?suse_version}
 %service_add_pre %{name}.service
-%service_add_pre %{name}.socket
 %endif
 
 %post
 %{__chown} -R %{rmilter_user}:%{rmilter_group} %{rmilter_home}
 %if 0%{?suse_version}
 %service_add_post %{name}.service
-%service_add_post %{name}.socket
 %endif
-%if 0%{?fedora} || 0%{?el7}
-%systemd_post %{name}.service
-%systemd_post %{name}.socket
+%if 0%{?not_suse} && 0%{?has_systemd}
+#Macro is not used as we want to do this on upgrade
+#%systemd_post %{name}.service
+systemctl --no-reload preset %{name}.service >/dev/null 2>&1 || :
 %endif
 %if 0%{?el6}
 /sbin/chkconfig --add %{name}
@@ -124,11 +128,9 @@ rm -rf %{buildroot}
 %preun
 %if 0%{?suse_version}
 %service_del_preun %{name}.service
-%service_del_preun %{name}.socket
 %endif
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?not_suse} && 0%{?has_systemd}
 %systemd_preun %{name}.service
-%systemd_preun %{name}.socket
 %endif
 %if 0%{?el6}
 if [ $1 = 0 ]; then
@@ -140,11 +142,9 @@ fi
 %postun
 %if 0%{?suse_version}
 %service_del_postun %{name}.service
-%service_del_postun %{name}.socket
 %endif
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?not_suse} && 0%{?has_systemd}
 %systemd_postun_with_restart %{name}.service
-%systemd_postun %{name}.socket
 %endif
 %if 0%{?el6}
 if [ $1 -ge 1 ]; then
@@ -155,9 +155,9 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%if 0%{?suse_version} || 0%{?fedora} || 0%{?el7}
+%if 0%{?has_systemd}
 %{_unitdir}/%{name}.service
-%{_unitdir}/%{name}.socket
+%{_presetdir}/80-rmilter.preset
 %endif
 %if 0%{?el6}
 %{_initrddir}/%{name}