Your message dated Sun, 16 Dec 2018 23:21:15 +0000
with message-id <e1gyfil-000dol...@fasolo.debian.org>
and subject line Bug#913848: fixed in prayer 1.3.5-dfsg1-6
has caused the Debian Bug report #913848,
regarding prayer: ftbfs with glibc 2.28 in experimental
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
913848: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913848
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: prayer
Version: 1.3.5-dfsg1-5
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Hi Magnus,

In Ubuntu, we found that the prayer packages is failing to build from source
with the following error:

[...]
gcc -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I../lib -c 
-DACCOUNTD_PAM_ENABLE=1 authenticate.c
authenticate.c:99:14: error: conflicting types for ‘crypt’
 extern char *crypt(char *password, char *salt);
              ^~~~~
In file included from accountd.h:14,
                 from authenticate.c:9:
/usr/include/unistd.h:1124:14: note: previous declaration of ‘crypt’ was here
 extern char *crypt (const char *__key, const char *__salt)
              ^~~~~
[...]

  (https://launchpad.net/ubuntu/+source/prayer/1.3.5-dfsg1-5/+build/15633911)

This is because glibc 2.28 provides a tightened prototype for crypt(), and
the local prototype in authenticate.c is not compatible.

The local prototype should just be dropped in favor of the system one,
considering the comments in the code claim it was added in the first place
for Linux, where we know it is not needed.

I have uploaded the attached patch to Ubuntu to fix this build failure;
please consider applying it in Debian as well.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru prayer-1.3.5-dfsg1/debian/patches/glibc-2.28.patch 
prayer-1.3.5-dfsg1/debian/patches/glibc-2.28.patch
--- prayer-1.3.5-dfsg1/debian/patches/glibc-2.28.patch  1969-12-31 
16:00:00.000000000 -0800
+++ prayer-1.3.5-dfsg1/debian/patches/glibc-2.28.patch  2018-11-15 
14:34:02.000000000 -0800
@@ -0,0 +1,23 @@
+Description: drop wrong prototype for crypt()
+ The code provides its own protoype for crypt, claiming that Linux doesn't
+ have one in its system headers.  Not only is that wrong, but the local
+ prototype is now incorrect, causing a build failure.
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Last-Modified: 2018-11-15
+
+Index: prayer-1.3.5-dfsg1/accountd/authenticate.c
+===================================================================
+--- prayer-1.3.5-dfsg1.orig/accountd/authenticate.c
++++ prayer-1.3.5-dfsg1/accountd/authenticate.c
+@@ -94,11 +94,6 @@
+ /* Definies a whole series of different authentication methods, including
+  * PAM if PAM support configured in ../Config */
+ 
+-/* No prototype for crypt, at least on Linux */
+-#if HAVE_SHADOW
+-extern char *crypt(char *password, char *salt);
+-#endif
+-
+ /* ====================================================================== */
+ 
+ #ifdef ACCOUNTD_PAM_ENABLE
diff -Nru prayer-1.3.5-dfsg1/debian/patches/no-referrer.patch 
prayer-1.3.5-dfsg1/debian/patches/no-referrer.patch
--- prayer-1.3.5-dfsg1/debian/patches/no-referrer.patch 2018-10-27 
10:58:34.000000000 -0700
+++ prayer-1.3.5-dfsg1/debian/patches/no-referrer.patch 2018-11-15 
14:32:53.000000000 -0800
@@ -2,8 +2,10 @@
 Description: Add no-referrer meta header to templates.
  * CVE-2018-18655
 
---- a/templates/cam/header.t
-+++ b/templates/cam/header.t
+Index: prayer-1.3.5-dfsg1/templates/cam/header.t
+===================================================================
+--- prayer-1.3.5-dfsg1.orig/templates/cam/header.t
++++ prayer-1.3.5-dfsg1/templates/cam/header.t
 @@ -11,6 +11,7 @@
  % ENDIF
  <meta name="robots" content="none" />
@@ -12,8 +14,10 @@
  <link rel="stylesheet" href="/static/layout.css"
        type="text/css" media="all" />
  <link rel="stylesheet" href="/static/print.css"
---- a/templates/old/header.t
-+++ b/templates/old/header.t
+Index: prayer-1.3.5-dfsg1/templates/old/header.t
+===================================================================
+--- prayer-1.3.5-dfsg1.orig/templates/old/header.t
++++ prayer-1.3.5-dfsg1/templates/old/header.t
 @@ -11,6 +11,7 @@
  % ENDIF
  <meta name="robots" content="none" />
diff -Nru prayer-1.3.5-dfsg1/debian/patches/series 
prayer-1.3.5-dfsg1/debian/patches/series
--- prayer-1.3.5-dfsg1/debian/patches/series    2018-10-27 10:58:34.000000000 
-0700
+++ prayer-1.3.5-dfsg1/debian/patches/series    2018-11-15 14:32:59.000000000 
-0800
@@ -9,3 +9,4 @@
 disable_ssl3.patch
 openssl1.1.patch
 no-referrer.patch
+glibc-2.28.patch

--- End Message ---
--- Begin Message ---
Source: prayer
Source-Version: 1.3.5-dfsg1-6

We believe that the bug you reported is fixed in the latest version of
prayer, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 913...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Magnus Holmgren <holmg...@debian.org> (supplier of updated prayer package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sun, 16 Dec 2018 22:27:47 +0100
Source: prayer
Binary: prayer prayer-templates-src prayer-templates-dev prayer-accountd
Architecture: source amd64 all
Version: 1.3.5-dfsg1-6
Distribution: unstable
Urgency: medium
Maintainer: Magnus Holmgren <holmg...@debian.org>
Changed-By: Magnus Holmgren <holmg...@debian.org>
Description:
 prayer     - standalone IMAP-based webmail server
 prayer-accountd - account management daemon for Prayer
 prayer-templates-dev - tools for compiling Prayer templates
 prayer-templates-src - templates for customizing Prayer Webmail
Closes: 913848
Changes:
 prayer (1.3.5-dfsg1-6) unstable; urgency=medium
 .
   * Merge changes from Ubuntu (Closes: #913848).
 .
 prayer (1.3.5-dfsg1-5ubuntu1) disco; urgency=medium
 .
   * debian/patches/glibc-2.28.patch: drop wrong prototype for crypt().
Checksums-Sha1:
 a5d90da7ebb6908f8a90f21909daaf1dd478b26d 2155 prayer_1.3.5-dfsg1-6.dsc
 bdf1963f8a2dd4682ed80076d19b56cb463673b9 26852 
prayer_1.3.5-dfsg1-6.debian.tar.xz
 cd97f2a3cd621b0bb69ea2a2c756c0ae70d6db84 117992 
prayer-accountd-dbgsym_1.3.5-dfsg1-6_amd64.deb
 d4c19fdd731046f44962eff41da4c3b75d16daf0 102920 
prayer-accountd_1.3.5-dfsg1-6_amd64.deb
 cde834eadcb213e458d2ed18ea055b97b4a2fafa 1529108 
prayer-dbgsym_1.3.5-dfsg1-6_amd64.deb
 5ab5b7501e666bca155783142144eaf26f01bc99 117632 
prayer-templates-dev-dbgsym_1.3.5-dfsg1-6_amd64.deb
 bfd4a3600420771485efffd4d68610002580f04d 70652 
prayer-templates-dev_1.3.5-dfsg1-6_amd64.deb
 91204ef315bb5b1d3a33d6c77f288fb536af4e5b 106496 
prayer-templates-src_1.3.5-dfsg1-6_all.deb
 e2d6560df1a3f515c904b49cb24aa3be7d01d846 8949 
prayer_1.3.5-dfsg1-6_amd64.buildinfo
 93bf465dc1a7afcb560005c5bb6a8fed0ec38947 524256 prayer_1.3.5-dfsg1-6_amd64.deb
Checksums-Sha256:
 12247a3403c7da60463efe0b05c746c2f61a46647cbfb1d75cc1e72f0940d010 2155 
prayer_1.3.5-dfsg1-6.dsc
 857e3bc476f6b4827a5160e37cfc21c5e1a2976eca29bf70986e4c2d92239cc7 26852 
prayer_1.3.5-dfsg1-6.debian.tar.xz
 83bd22afeca0e515850fc13e320c0d85e856f1f98ff2b1c45dc1afbb2c2dda66 117992 
prayer-accountd-dbgsym_1.3.5-dfsg1-6_amd64.deb
 5653fceae117b0888317502ce118342542379ffb3467fb4a6d85cdf1f6c1f91a 102920 
prayer-accountd_1.3.5-dfsg1-6_amd64.deb
 7b7d0b39e7432246e5076c8160253acb2ee82eab9d401e62e142cfa821a568ef 1529108 
prayer-dbgsym_1.3.5-dfsg1-6_amd64.deb
 dc725a5e76e94f604cf840c83b8c31c4ca52392e17d9c6ca42c3c4eec3666e88 117632 
prayer-templates-dev-dbgsym_1.3.5-dfsg1-6_amd64.deb
 f676691b71047358220420eb54c5733fe4e5b3975f7ef04c83bb28a99ed5eba2 70652 
prayer-templates-dev_1.3.5-dfsg1-6_amd64.deb
 3b20f5f1c307a2f68a8225f9e2644eebd4128c30794f6b43a3f422855be19aff 106496 
prayer-templates-src_1.3.5-dfsg1-6_all.deb
 0a17620d547ee4df50e5911c6b6c182485ab42581c3b6c5106ff78d8f6bddcc3 8949 
prayer_1.3.5-dfsg1-6_amd64.buildinfo
 c91e2540563574a9b4d8075dd8cce74b257e1afcbfaf262d282c37a803741da6 524256 
prayer_1.3.5-dfsg1-6_amd64.deb
Files:
 e4025c3bb87c7403ff48813902cd3f0f 2155 mail optional prayer_1.3.5-dfsg1-6.dsc
 dceaf676259e16561c4b4c57045f0cb2 26852 mail optional 
prayer_1.3.5-dfsg1-6.debian.tar.xz
 e6b62f6d994230da9769344c0e911157 117992 debug optional 
prayer-accountd-dbgsym_1.3.5-dfsg1-6_amd64.deb
 efaf12eb7284ccc9323d78ce4217fc3d 102920 mail optional 
prayer-accountd_1.3.5-dfsg1-6_amd64.deb
 194c721a7462a24538f5cbaa559f6990 1529108 debug optional 
prayer-dbgsym_1.3.5-dfsg1-6_amd64.deb
 cb568d5ef0455492decfe6c21176a499 117632 debug optional 
prayer-templates-dev-dbgsym_1.3.5-dfsg1-6_amd64.deb
 6bfe9f2b0be46424e2892d3f26627936 70652 mail optional 
prayer-templates-dev_1.3.5-dfsg1-6_amd64.deb
 063960b3c72beadc614e3bf8fcb63bb2 106496 mail optional 
prayer-templates-src_1.3.5-dfsg1-6_all.deb
 03b889bf81912ca27a8cf25c79e592e5 8949 mail optional 
prayer_1.3.5-dfsg1-6_amd64.buildinfo
 6feb7140d29319723088164d8e9409cd 524256 mail optional 
prayer_1.3.5-dfsg1-6_amd64.deb

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEzSoHOzhhVBcKQILo1PIZv+yZhIkFAlwW1CMACgkQ1PIZv+yZ
hIlymQ//ekTqD34vSMBD8alDfPWPB3VlU9t/owEmePNCCClZUQaBG6T3FBnoHa72
tSyUVzPgzrUIZYtWr7qx60u35k/qD1baXMLPbeaiN4Wgk/TTaBDzg1GMtOhxmwXK
3ShQu1CkluBXGRhvhNXuSXrEynIWkIM8/IlYkTJJbDA5aJEUIVXKmmNoAx5iONgX
e2JcgL6Q/u3eCMieCBV5fqoCmKVe8a0DcVsQ7s8Ubki2sBRbQpki4JmFjpdnqt6Z
7LtE2BMJxAGUrXan+R4IxeJsiCHSlLmq3ae7EZHzLZlr1XUp6i2ZMXK8D9VAtRoM
iKg5Uv6J3QwWhAHkN6aWIGt63waj1k2u5SMhAwMAycJcOid6s3o9bqn6GOZg4R7e
hWBr7pIcyR5KhMT+SEKoyz0MiZMucUcKDb0UxUU5WoFgdci/rSbT5dxPhulWnFjr
8z8yHB7F1FLsispJpXh75VlSeRVp70XAyiaEZPp4pZvd8yU9Pz30tHcwJAzSEMc+
qPKDX65e6LOHh3HEAIXkruUdAv3MZeURJmDNxSJU0G+wVkOhDoIGwZKazREoV3Yk
vhhfK/rCqfbjzXUw29+TD6nxPR8tCLketWmuDNpabJfI0IGIAM6WRhkWmIfKrAyy
Au94fZ/Z3ppO44gIYxzikuxFyb+D4xlMpEBWd7YS9fPffHoiPYI=
=y8+1
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to