rpm/courier-imap
SHA256
1
0
Fork 0
forked from pool/courier-imap
Code Pull Requests Activity

Accepting request 747954 from home:adkorte:branches:server:mail

Browse Source 
- update to 5.0.8
  * Update documentation in the imapd and pop3d ssl config flies.
- update to 5.0.7
  * pop3dserver.c (do_retr): Use the new MIME_UNICODE_MESSAGE_TYPE
    setting to set the type of the wrapped MIME attachment.
- update to 5.0.6
  * pop3dserver.c: Fix parsing of pop3d file cache, on some
    architectures.
  * tcpd/libcouriertls.c: Ignore unreadable cert files.
- update to 5.0.5
  * fetch.c: Send an alert about a Unicode messages to a non-Unicode
    client at most once per IMAP session.
- update to 5.0.4
  * pop3dserver.c: Deal with MS Outlook's broken implementation of
    RFC 6856.
- update to 5.0.3
  * pop3dserver.c (calcsize): Fix spurious flagging of non-UTF8
    messages as UTF-8.
    To fix existing mailboxes with erroneously-flagged messages. In
    each mailbox, if its existing courierpop3dsizelist file starts with
    /3 [followed by additional data]
    Only if the first line in courierpop3dsizelist starts with /3, then
    execute:
    perl -p -i -e 's/:\d+$/:0/' courierpop3dsizelist
  * pop3dserver.c (readpop3dlist): Be able to update
    courierpop3dsizelist from version 2 to 3 in place.
    (do_retr): Instead of returning an ERR to a non-Unicode client,
    handle Unicode messages by wrapping them as an attachment.
- update to 5.0.2
  * configure.ac: Additional changes to how Unicode messages are
    handled with non-Unicode clients: disclaim all warranties, still
    report an error, but provide the raw message content, as is.
- update to 5.0.1
  * Provide an substitute message to IMAP clients that did not enable
    UTF-8.
  * couriertls: additional fixes.
  * couriertls: option to use a separate file for the SSL certificate's
    private key, as an alternative to the combined keyfile+certificate.
- update to 5.0.0
  * pop3dserver.c: update Courier-IMAP to support UTF8 POP3. Update
    version of the courierpop3dsizelist cache file.
  * courier-imap, sqwebmail: update Courier-IMAP to support UTF8 IMAP.
    Convert maildir folders to use UTF-8 for folder names. Add
    --checkutf8 and --convutf8 options to maildirmake to convert
    pre-UTF8 maildirs to UTF8 maildirs, a mandatory upgrade procedure.
  * waitlib/configure.ac: Fix typo.
  * libs/tcpd/starttls.c (main): Add -user option. Additional fixes
    to startup script to have couriertls drop root privileges.
  * libs/tcpd/tlsclient.h: add username option, used in couriertls_start
    to set the child process's uid and gid.
  * imaplogin.c (starttls): Set username option for couriertls
  * pop3login.c (starttls): Set username option for couriertls
  * imapd-ssl.dist, pop3d-ssl.dist: Use separate imap and pop3 session
    cache files. Startup script: remove/set ownership and permsission
    on the imap and pop3 session cache files.
  * libs/tcpd/libcouriergnutls.c: Remove usage of deprecated OpenPGP
    API. Tag the "Unexpected SSL connection shutdown" with the "DEBUG"
    label just like the OpenSSL version does.
  * libs/tcpd/starttls.c: If TCPREMOTEIP is set, prepend it to error
    messages.
- delete reproducible.patch (upstreamed)
- add courier-imap.keyring for source verification
- cleanup spec

OBS-URL: https://build.opensuse.org/request/show/747954
OBS-URL: https://build.opensuse.org/package/show/server:mail/courier-imap?expand=0&rev=87
This commit is contained in:
Christian Wittmer 2020-01-31 21:39:22 +00:00 committed by Git OBS Bridge
parent 9faf5ec8fc
commit ca74594a78
8 changed files with 242 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
courier-imap-4.18.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f66ceda3e5aa853e13f417302dfb83b312709e95f1bbcdafcd6214d76a94e79a
size 3205230

BIN
courier-imap-4.18.2.tar.bz2.sig
View File

Binary file not shown.

3
courier-imap-5.0.8.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6de26c96f92c50f83af4e9e4b5a5d7d4e55031fb42a8b1229d4f05904c1bb2d4
size 3296810

BIN
courier-imap-5.0.8.tar.bz2.sig Normal file
View File

Binary file not shown.

67
courier-imap.changes
View File

@ -1,3 +1,70 @@
-------------------------------------------------------------------
Tue Nov 12 15:23:15 UTC 2019 - Arjen de Korte <suse+build@de-korte.org>
- update to 5.0.8
* Update documentation in the imapd and pop3d ssl config flies.
- update to 5.0.7
* pop3dserver.c (do_retr): Use the new MIME_UNICODE_MESSAGE_TYPE
setting to set the type of the wrapped MIME attachment.
- update to 5.0.6
* pop3dserver.c: Fix parsing of pop3d file cache, on some
architectures.
* tcpd/libcouriertls.c: Ignore unreadable cert files.
- update to 5.0.5
* fetch.c: Send an alert about a Unicode messages to a non-Unicode
client at most once per IMAP session.
- update to 5.0.4
* pop3dserver.c: Deal with MS Outlook's broken implementation of
RFC 6856.
- update to 5.0.3
* pop3dserver.c (calcsize): Fix spurious flagging of non-UTF8
messages as UTF-8.
To fix existing mailboxes with erroneously-flagged messages. In
each mailbox, if its existing courierpop3dsizelist file starts with
/3 [followed by additional data]
Only if the first line in courierpop3dsizelist starts with /3, then
execute:
perl -p -i -e 's/:\d+$/:0/' courierpop3dsizelist
* pop3dserver.c (readpop3dlist): Be able to update
courierpop3dsizelist from version 2 to 3 in place.
(do_retr): Instead of returning an ERR to a non-Unicode client,
handle Unicode messages by wrapping them as an attachment.
- update to 5.0.2
* configure.ac: Additional changes to how Unicode messages are
handled with non-Unicode clients: disclaim all warranties, still
report an error, but provide the raw message content, as is.
- update to 5.0.1
* Provide an substitute message to IMAP clients that did not enable
UTF-8.
* couriertls: additional fixes.
* couriertls: option to use a separate file for the SSL certificate's
private key, as an alternative to the combined keyfile+certificate.
- update to 5.0.0
* pop3dserver.c: update Courier-IMAP to support UTF8 POP3. Update
version of the courierpop3dsizelist cache file.
* courier-imap, sqwebmail: update Courier-IMAP to support UTF8 IMAP.
Convert maildir folders to use UTF-8 for folder names. Add
--checkutf8 and --convutf8 options to maildirmake to convert
pre-UTF8 maildirs to UTF8 maildirs, a mandatory upgrade procedure.
* waitlib/configure.ac: Fix typo.
* libs/tcpd/starttls.c (main): Add -user option. Additional fixes
to startup script to have couriertls drop root privileges.
* libs/tcpd/tlsclient.h: add username option, used in couriertls_start
to set the child process's uid and gid.
* imaplogin.c (starttls): Set username option for couriertls
* pop3login.c (starttls): Set username option for couriertls
* imapd-ssl.dist, pop3d-ssl.dist: Use separate imap and pop3 session
cache files. Startup script: remove/set ownership and permsission
on the imap and pop3 session cache files.
* libs/tcpd/libcouriergnutls.c: Remove usage of deprecated OpenPGP
API. Tag the "Unexpected SSL connection shutdown" with the "DEBUG"
label just like the OpenSSL version does.
* libs/tcpd/starttls.c: If TCPREMOTEIP is set, prepend it to error
messages.
- delete reproducible.patch (upstreamed)
- add courier-imap.keyring for source verification
- cleanup spec
-------------------------------------------------------------------
Fri Jul 19 09:50:17 UTC 2019 - matthias.gerstner@suse.com

109
courier-imap.keyring Normal file
View File

@ -0,0 +1,109 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.14 (GNU/Linux)
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
=Hyk4
-----END PGP PUBLIC KEY BLOCK-----

178
courier-imap.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package courier-imap
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,21 +12,23 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: courier-imap
Version: 5.0.8
Release: 0
Summary: An IMAP and POP3 Server for Maildir MTAs
License: GPL-3.0-or-later
Group: Productivity/Networking/Email/Servers
Version: 4.18.2
Release: 0
Url: http://www.courier-mta.org/imap/
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-%{version}.tar.bz2.sig
URL: https://www.courier-mta.org/imap/
Source0: https://downloads.sourceforge.net/project/courier/imap/%{version}/%{name}-%{version}.tar.bz2
Source1: https://downloads.sourceforge.net/project/courier/imap/%{version}/%{name}-%{version}.tar.bz2.sig
Source2: pop3.pamd
Source3: imap.pamd
# Keyring downloaded from https://www.courier-mta.org/KEYS.bin#/%{name}.keyring
Source4: %{name}.keyring
Source11: courier-imap.init
Source12: courier-imap-ssl.init
Source13: courier-pop.init
@ -42,41 +44,30 @@ Patch2: %{name}-ulimit_conf.patch
### Patch for upstream:
## fixes typo in Makefile.am
Patch3: %{name}-Makefile.patch
# PATCH-FIX-UPSTEAM https://github.com/svarshavchik/courier-libs/pull/10
Patch4: reproducible.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 910
BuildRequires: audit-libs
%endif
BuildRequires: courier-authlib-devel >= 0.68
BuildRequires: courier-unicode-devel >= 2.0
BuildRequires: db-devel
%if 0%{?suse_version} >= 1220
BuildRequires: gamin-devel
%else
BuildRequires: fam-devel
%endif
BuildRequires: gcc-c++
BuildRequires: gdbm-devel
BuildRequires: libidn-devel
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
# openssl itself for /usr/bin/openssl configure check
BuildRequires: postfix
BuildRequires: procps
BuildRequires: zlib-devel
# openssl itself for /usr/bin/openssl configure check
BuildRequires: openssl
Conflicts: imap qpopper cyrus-imapd
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(systemd)
Requires: courier-authlib >= 0.68
Requires: fam-server
Requires: gdbm
Requires: openssl
%if 0%{?suse_version} >= 1210
BuildRequires: pkgconfig(systemd)
Conflicts: cyrus-imapd
Conflicts: imap
Conflicts: qpopper
%{?systemd_requires}
%define has_systemd 1
%endif
%description
Courier-IMAP is a fast, scalable, enterprise IMAP server that uses
@ -105,89 +96,72 @@ If you already have Courier installed, you do not need to download this
version. If you install this version, you must remove it if you later
install the entire Courier server.
%prep
%setup -n %{name}-%{version}
%setup -q
%patch0
%patch2
%patch3
%patch4 -p1
%build
%configure \
--with-notice=unicode \
--libexecdir=%{_prefix}/lib/%{name} \
--datadir=%{_datadir}/%{name} \
--sysconfdir=%{_sysconfdir}/courier \
--sharedstatedir=%{_sharedstatedir}/%{name} \
%if 0%{?has_systemd}
--with-piddir=/run \
%else
--with-piddir=%{_localstatedir}/run \
%endif
--with-piddir=%{_rundir} \
--disable-static \
--disable-root-check \
--enable-unicode \
%if 0%{?has_systemd}
--with-authdaemonvar=/run/courier-authlib \
%else
--with-authdaemonvar=%{_localstatedir}/run/courier-authlib \
%endif
--with-notice=unicode \
--with-authdaemonvar=%{_rundir}/courier-authlib \
--with-certdb=%{_sysconfdir}/ssl/certs \
--with-certsdir=%{_sysconfdir}/ssl/private \
--enable-workarounds-for-imap-client-bugs
%{__make} %{_smp_mflags}
make %{?_smp_mflags}
%install
%{__make} install DESTDIR=%{buildroot}
%make_install
# Move daemons into sbin
%{__mv} %{buildroot}%{_prefix}/bin/{couriertls,imapd,pop3d} %{buildroot}%{_prefix}/sbin/
mv %{buildroot}%{_bindir}/{couriertls,imapd,pop3d} %{buildroot}%{_sbindir}/
# Rename imapd.8 to courier-imapd.8
%{__mv} %{buildroot}%{_mandir}/man8/imapd.8 %{buildroot}%{_mandir}/man8/%{name}d.8
mv %{buildroot}%{_mandir}/man8/imapd.8 %{buildroot}%{_mandir}/man8/%{name}d.8
# Install PAM config files
%{__install} -D -m 644 $RPM_SOURCE_DIR/pop3.pamd %{buildroot}/etc/pam.d/pop3
%{__install} -D -m 644 $RPM_SOURCE_DIR/imap.pamd %{buildroot}/etc/pam.d/imap
install -D -m 644 $RPM_SOURCE_DIR/pop3.pamd %{buildroot}%{_sysconfdir}/pam.d/pop3
install -D -m 644 $RPM_SOURCE_DIR/imap.pamd %{buildroot}%{_sysconfdir}/pam.d/imap
# Install init scripts
%if 0%{?has_systemd}
for i in imap imap-ssl imap-gencert pop pop-ssl pop-gencert; do
%{__ln_s} -f service %{buildroot}%{_prefix}/sbin/rccourier-$i
ln -s -f service %{buildroot}%{_sbindir}/rccourier-$i
done
%else
for i in imap imap-ssl pop pop-ssl ; do
%{__install} -D -m 0755 $RPM_SOURCE_DIR/courier-$i.init %{buildroot}/etc/init.d/courier-$i
%{__ln_s} -f /etc/init.d/courier-$i %{buildroot}%{_prefix}/sbin/rccourier-$i
done
%endif
# Install service files
%if 0%{?has_systemd}
for j in imap imap-ssl imap-gencert pop pop-ssl pop-gencert; do
%{__install} -D -m 0644 $RPM_SOURCE_DIR/courier-$j.service %{buildroot}/%{_unitdir}/courier-$j.service
install -D -m 0644 $RPM_SOURCE_DIR/courier-$j.service %{buildroot}/%{_unitdir}/courier-$j.service
done
%endif
# Remove original init scripts, will not work longer
%{__rm} %{buildroot}%{_prefix}/lib/%{name}/imapd.rc
%{__rm} %{buildroot}%{_prefix}/lib/%{name}/imapd-ssl.rc
%{__rm} %{buildroot}%{_prefix}/lib/%{name}/pop3d.rc
%{__rm} %{buildroot}%{_prefix}/lib/%{name}/pop3d-ssl.rc
rm %{buildroot}%{_prefix}/lib/%{name}/imapd.rc
rm %{buildroot}%{_prefix}/lib/%{name}/imapd-ssl.rc
rm %{buildroot}%{_prefix}/lib/%{name}/pop3d.rc
rm %{buildroot}%{_prefix}/lib/%{name}/pop3d-ssl.rc
#
# Fix imapd.dist
#
%{__sed} -i -e 's/^IMAPDSTART=.*/IMAPDSTART=YES/' %{buildroot}%{_sysconfdir}/courier/imapd.dist
%{__sed} -i -e 's/^ADDRESS=.*/ADDRESS=127.0.0.1/' %{buildroot}%{_sysconfdir}/courier/imapd.dist
%{__sed} -i -e 's/^MAXPERIP=.*/MAXPERIP=20/' %{buildroot}%{_sysconfdir}/courier/imapd.dist
%{__sed} -i -e 's/^IMAPDSSLSTART=.*/IMAPDSSLSTART=YES/' %{buildroot}%{_sysconfdir}/courier/imapd-ssl.dist
#%{__sed} -i -e 's/^#\ \+\(TLS_CIPHER_LIST=.*\)/\1/' %{buildroot}%{_sysconfdir}/courier/imapd-ssl.dist
%{__sed} -i -e 's/^POP3DSTART=.*/POP3DSTART=YES/' %{buildroot}%{_sysconfdir}/courier/pop3d.dist
%{__sed} -i -e 's/^POP3DSSLSTART=.*/POP3DSSLSTART=YES/' %{buildroot}%{_sysconfdir}/courier/pop3d-ssl.dist
#%{__sed} -i -e 's/^#\ \+\(TLS_CIPHER_LIST=.*\)/\1/' %{buildroot}%{_sysconfdir}/courier/pop3d-ssl.dist
sed -i -e 's/^IMAPDSTART=.*/IMAPDSTART=YES/' %{buildroot}%{_sysconfdir}/courier/imapd.dist
sed -i -e 's/^ADDRESS=.*/ADDRESS=127.0.0.1/' %{buildroot}%{_sysconfdir}/courier/imapd.dist
sed -i -e 's/^MAXPERIP=.*/MAXPERIP=20/' %{buildroot}%{_sysconfdir}/courier/imapd.dist
sed -i -e 's/^IMAPDSSLSTART=.*/IMAPDSSLSTART=YES/' %{buildroot}%{_sysconfdir}/courier/imapd-ssl.dist
#sed -i -e 's/^#\ \+\(TLS_CIPHER_LIST=.*\)/\1/' %{buildroot}%{_sysconfdir}/courier/imapd-ssl.dist
sed -i -e 's/^POP3DSTART=.*/POP3DSTART=YES/' %{buildroot}%{_sysconfdir}/courier/pop3d.dist
sed -i -e 's/^POP3DSSLSTART=.*/POP3DSSLSTART=YES/' %{buildroot}%{_sysconfdir}/courier/pop3d-ssl.dist
#sed -i -e 's/^#\ \+\(TLS_CIPHER_LIST=.*\)/\1/' %{buildroot}%{_sysconfdir}/courier/pop3d-ssl.dist
# For %doc macro
%{__install} -m 0644 libs/imap/ChangeLog ChangeLog
%{__install} -m 0644 libs/imap/README README.imap
%{__install} -m 0644 libs/imap/README.proxy README.proxy
%{__install} -m 0644 libs/maildir/README.maildirquota.txt README.maildirquota
%{__install} -m 0644 libs/maildir/README.sharedfolders.txt README.sharedfolders
%{__install} -D -m 0755 sysconftool %{buildroot}%{_datadir}/%{name}/sysconftool
%{__chmod} 755 %{buildroot}%{_datadir}/%{name}/sysconftool
%{__cat} >%{buildroot}%{_datadir}/%{name}/configlist <<EOF
install -m 0644 libs/imap/ChangeLog ChangeLog
install -m 0644 libs/imap/README README.imap
install -m 0644 libs/imap/README.proxy README.proxy
install -m 0644 libs/maildir/README.maildirquota.txt README.maildirquota
install -m 0644 libs/maildir/README.sharedfolders.txt README.sharedfolders
install -D -m 0755 sysconftool %{buildroot}%{_datadir}/%{name}/sysconftool
chmod 755 %{buildroot}%{_datadir}/%{name}/sysconftool
cat >%{buildroot}%{_datadir}/%{name}/configlist <<EOF
%{_sysconfdir}/courier/imapd.dist
%{_sysconfdir}/courier/imapd-ssl.dist
%{_sysconfdir}/courier/pop3d.dist
@ -195,68 +169,44 @@ done
EOF
%pre
%if 0%{?has_systemd}
for i in imap imap-ssl imap-gencert pop pop-ssl pop-gencert; do
%service_add_pre courier-$i.service
done
%endif
%preun
%if 0%{?has_systemd}
for i in imap imap-ssl imap-gencert pop pop-ssl pop-gencert; do
%service_del_preun courier-$i.service
done
%else
%if 0%{?suse_version}
for i in imap imap-ssl pop pop-ssl; do
%stop_on_removal courier-$i
done
%endif
%endif
if [ "$1" = "0" ]; then
%{__rm} -f %{_localstatedir}/couriersslcache
%{__rm} -f %{_localstatedir}/imapd.pid
%{__rm} -f %{_localstatedir}/imapd-ssl.pid
%{__rm} -f %{_localstatedir}/imapd.pid.lock
%{__rm} -f %{_localstatedir}/imapd-ssl.pid.lock
%{__rm} -f %{_localstatedir}/pop3d.pid
%{__rm} -f %{_localstatedir}/pop3d-ssl.pid
%{__rm} -f %{_localstatedir}/pop3d.pid.lock
%{__rm} -f %{_localstatedir}/pop3d-ssl.pid.lock
rm -f %{_localstatedir}/couriersslcache
rm -f %{_localstatedir}/imapd.pid
rm -f %{_localstatedir}/imapd-ssl.pid
rm -f %{_localstatedir}/imapd.pid.lock
rm -f %{_localstatedir}/imapd-ssl.pid.lock
rm -f %{_localstatedir}/pop3d.pid
rm -f %{_localstatedir}/pop3d-ssl.pid
rm -f %{_localstatedir}/pop3d.pid.lock
rm -f %{_localstatedir}/pop3d-ssl.pid.lock
fi
%post
%{_datadir}/%{name}/sysconftool `%{__cat} %{_datadir}/%{name}/configlist` >/dev/null
%if 0%{?has_systemd}
%{_datadir}/%{name}/sysconftool `cat %{_datadir}/%{name}/configlist` >/dev/null
for i in imap imap-ssl imap-gencert pop pop-ssl pop-gencert; do
%service_add_post courier-$i.service
done
%endif
%postun
%if 0%{?has_systemd}
for i in imap imap-ssl imap-gencert pop pop-ssl pop-gencert; do
%service_del_postun courier-$i.service
done
%else
for i in imap imap-ssl pop pop-ssl; do
%restart_on_update courier-$i
done
%insserv_cleanup
%endif
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,755)
%doc AUTHORS libs/imap/ChangeLog COPYING* libs/imap/BUGS README README.imap README.maildirquota README.proxy
%license COPYING*
%doc AUTHORS libs/imap/ChangeLog libs/imap/BUGS README README.imap README.maildirquota README.proxy
%doc README.sharedfolders
%if !0%{?has_systemd}
%attr(755,root,root) /etc/init.d/courier-*
%endif
%config %attr(644,root,root) /etc/pam.d/imap
%config %attr(644,root,root) /etc/pam.d/pop3
%config %attr(644,root,root) %{_sysconfdir}/pam.d/imap
%config %attr(644,root,root) %{_sysconfdir}/pam.d/pop3
%dir %{_sysconfdir}/courier
%dir %{_sysconfdir}/courier/imapaccess
%dir %{_sysconfdir}/courier/shared
@ -272,8 +222,6 @@ done
%{_bindir}/*
%{_sbindir}/*
%{_mandir}/man?/*
%if 0%{?has_systemd}
%{_unitdir}/courier-*.service
%endif
%changelog

25
reproducible.patch
View File

@ -1,25 +0,0 @@
merged upstream: https://github.com/svarshavchik/courier-libs/pull/10
from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824037
Date: 2016-05-11
Description: Use SOURCE_DATE_EPOCH for imapd version
Use the environment variable SOURCE_DATE_EPOCH (if set) for imapd
PROGRAMVERSION, to make the build reproducible.
See https://reproducible-builds.org/specs/source-date-epoch/
Author: Alexis Bienvenüe <pado@passoire.fr>
Index: courier-imap-4.18.2/libs/imap/configure
===================================================================
--- courier-imap-4.18.2.orig/libs/imap/configure
+++ courier-imap-4.18.2/libs/imap/configure
@@ -18345,7 +18345,9 @@ courier)
;;
esac
-date=`date`
+SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-`date +%s`}"
+date=`date -u -d "@$SOURCE_DATE_EPOCH" "+%F %T" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+%F %T" 2>/dev/null || date -u "+%F %T"`
+
cat >>confdefs.h <<_ACEOF
#define PROGRAMVERSION "$package/${target_cpu}-${target_vendor}-${target_os}/$date"