diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-08-13 04:49:18 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-08-13 04:51:38 +0100 |
| commit | 66a62e2fcfeecd0baed5f597c9f7e5970fd1fd5b (patch) | |
| tree | 027f26b40d27e2536dbc4304ee13d74b507dc29e | |
| parent | 145158a19941618098256e044c8521a139ef5c0e (diff) | |
exim: some clean ups
* use username/group 'exim' instead of mail
* register configuration file
* make sure /usr/lib/exim/lookups exists
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | mail/exim/Makefile | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 289aa891b..094a3d35f 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -48,7 +48,7 @@ define Package/exim/Default DEPENDS:=+libdb47 +libpcre $(ICONV_DEPENDS) +BUILD_NLS:libidn2 +BUILD_NLS:libidn TITLE:=Exim message transfer agent URL:=http://www.exim.org/ - USERID:=mail=42:mail=42 + USERID:=exim=42:exim=42 endef define Package/exim @@ -149,8 +149,8 @@ define Build/Configure echo "PID_FILE_PATH=/var/run/exim.pid" >> $(PKG_BUILD_DIR)/Local/Makefile echo "BIN_DIRECTORY=/usr/sbin" >> $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%CONFIGURE_FILE=/usr/exim/configure%CONFIGURE_FILE=/etc/exim/exim.conf%' $(PKG_BUILD_DIR)/Local/Makefile - $(SED) 's%# EXIM_GROUP=%EXIM_GROUP=42%' $(PKG_BUILD_DIR)/Local/Makefile - $(SED) 's%# EXIM_USER=exim%EXIM_USER=42%' $(PKG_BUILD_DIR)/Local/Makefile + $(SED) 's%# EXIM_GROUP=.*%EXIM_GROUP=42%' $(PKG_BUILD_DIR)/Local/Makefile + $(SED) 's%# EXIM_USER=.*%EXIM_USER=42%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# INCLUDE=.*%INCLUDE=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# HAVE_IPV6=YES%HAVE_IPV6=YES%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# WITH_CONTENT_SCAN=yes%WITH_CONTENT_SCAN=yes%' $(PKG_BUILD_DIR)/Local/Makefile @@ -263,13 +263,22 @@ endif $(HOST_MAKE_VARS) $(MAKE) $(HOST_MAKE_FLAGS) $(HOST_MAKE_VARS) -C $(PKG_BUILD_DIR)/build-Linux-$(ARCH) macro_predef endef +define Package/exim/conffiles +/etc/exim/ +endef + +Package/exim-gnutls/conffiles = $(Package/exim/conffiles) +Package/exim-openssl/conffiles = $(Package/exim/conffiles) +Package/exim-ldap/conffiles = $(Package/exim/conffiles) + define Package/exim/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/build-Linux-$(ARCH)/exim $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/exim - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/configure.default $(1)/etc/exim/exim.conf + $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/configure.default $(1)/etc/exim/exim.conf $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/exim.init $(1)/etc/init.d/exim + $(INSTALL_DIR) $(1)/usr/lib/exim/lookups endef Package/exim-gnutls/install = $(Package/exim/install) |