Source: dovecot Version: 1:2.2.34-2 Severity: normal Hi,
thanks for maintaining the dovecot packages. While rebuilding dovecot from source, I've noticed that doing this twice in a row fails: ~/dovecot-2.2.34 % debuild -us -uc [..] ~/dovecot-2.2.34 % debuild -us -uc [..] dpkg-source: info: local changes detected, the modified files are: dovecot-2.2.34/dovecot.service dovecot-2.2.34/src/config/all-settings.c dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/dovecot_2.2.34-2.diff.KZl62_ [..] Please see the diff below. Thanks, Chris --- /dev/null +++ dovecot-2.2.34/dovecot.service @@ -0,0 +1,32 @@ +# This file is part of Dovecot +# +# If you want to pass additionally command line options to the dovecot +# binary, create the file: +# `/etc/systemd/system/dovecot.service.d/service.conf'. + +[Unit] +Description=Dovecot IMAP/POP3 email server +Documentation=man:dovecot(1) +Documentation=http://wiki2.dovecot.org/ +After=local-fs.target network-online.target + +[Service] +Type=simple +ExecStart=/usr/sbin/dovecot -F +PIDFile=/var/run/dovecot/master.pid +ExecReload=/usr/bin/doveadm reload +ExecStop=/usr/bin/doveadm stop +PrivateTmp=true +NonBlocking=yes +# Enable this if your systemd is new enough to support it: +ProtectSystem=full + +# You can add environment variables with e.g.: +#Environment='CORE_OUTOFMEM=1' +# If you have trouble with `Too many open files' you may set: +#LimitNOFILE=8192 +# If you want to allow the Dovecot services to produce core dumps, use: +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target --- dovecot-2.2.34.orig/src/config/all-settings.c +++ dovecot-2.2.34/src/config/all-settings.c @@ -1068,7 +1068,7 @@ static const struct setting_define mbox_ }; static const struct mbox_settings mbox_default_settings = { .mbox_read_locks = "fcntl", - .mbox_write_locks = "dotlock fcntl", + .mbox_write_locks = "fcntl dotlock", .mbox_lock_timeout = 5*60, .mbox_dotlock_change_timeout = 2*60, .mbox_min_index_size = 0, @@ -2910,7 +2910,7 @@ struct master_settings master_default_se .state_dir = PKG_STATEDIR, .libexec_dir = PKG_LIBEXECDIR, .instance_name = PACKAGE, - .protocols = "imap pop3 lmtp", + .protocols = "", .listen = "*, ::", .ssl = "yes:no:required", .default_internal_user = "dovecot", @@ -2997,7 +2997,7 @@ static const struct setting_define login static const struct login_settings login_default_settings = { .login_trusted_networks = "", .login_source_ips = "", - .login_greeting = PACKAGE_NAME" ready.", + .login_greeting = DOVECOT_NAME" ready.", .login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c session=<%{session}>", .login_log_format = "%$: %s", .login_access_sockets = "", @@ -3154,7 +3154,7 @@ static const struct lmtp_settings lmtp_d .lmtp_user_concurrency_limit = 0, .lmtp_address_translate = "", .lmtp_hdr_delivery_address = "final:none:original", - .login_greeting = PACKAGE_NAME" ready.", + .login_greeting = DOVECOT_NAME" ready.", .login_trusted_networks = "" }; static const struct setting_parser_info *lmtp_setting_dependencies[] = { @@ -4802,34 +4802,34 @@ buffer_t config_all_services_buf = { const struct setting_parser_info *all_default_roots[] = { &master_service_setting_parser_info, &master_service_ssl_setting_parser_info, - &mail_storage_setting_parser_info, - &lmtp_setting_parser_info, + &mbox_setting_parser_info, + &master_setting_parser_info, &ssl_params_setting_parser_info, - &mail_user_setting_parser_info, - &stats_setting_parser_info, - &dict_setting_parser_info, - &imap_urlauth_setting_parser_info, + &pop3_setting_parser_info, + &mail_storage_setting_parser_info, &imap_urlauth_login_setting_parser_info, - &pop3_login_setting_parser_info, - &fs_crypt_setting_parser_info, - &imap_login_setting_parser_info, - &mbox_setting_parser_info, &pop3c_setting_parser_info, - &director_setting_parser_info, - &maildir_setting_parser_info, &auth_setting_parser_info, - &imap_urlauth_worker_setting_parser_info, - &pop3_setting_parser_info, - "a_status_setting_parser_info, - &login_setting_parser_info, + &fs_crypt_setting_parser_info, &aggregator_setting_parser_info, - &imap_setting_parser_info, + &lda_setting_parser_info, + &stats_setting_parser_info, + &dict_setting_parser_info, + &login_setting_parser_info, &doveadm_setting_parser_info, - &replicator_setting_parser_info, + &director_setting_parser_info, + &imap_login_setting_parser_info, + &imap_urlauth_worker_setting_parser_info, + "a_status_setting_parser_info, + &pop3_login_setting_parser_info, &imapc_setting_parser_info, + &imap_urlauth_setting_parser_info, + &maildir_setting_parser_info, &mdbox_setting_parser_info, - &lda_setting_parser_info, - &master_setting_parser_info, + &replicator_setting_parser_info, + &lmtp_setting_parser_info, + &mail_user_setting_parser_info, + &imap_setting_parser_info, NULL }; const struct setting_parser_info *const *all_roots = all_default_roots;
