Bug#305731: zaptel_1:1.0.7-4(i386/unstable): FTBFS: directories created with incorrect perms

[Steve Langasek]

--X6f5cqjOqKjuoPgI
Content-Type: multipart/mixed; boundary="rW45g2D1DgwV0HVw"
Content-Disposition: inline


--rW45g2D1DgwV0HVw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

tags 310150 patch
thanks

Hello,

I've prepared a 0-day NMU for this bug, so that zaptel is buildable,
including on xfs filesystems where this error apparently occurs.

The patch also includes a refined fix for bug #305731.

Upload to follow shortly.

Thanks,
--=20
Steve Langasek
postmodern programmer

--rW45g2D1DgwV0HVw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="zaptel-310150.diff"
Content-Transfer-Encoding: quoted-printable

diff -u zaptel-1.0.7/debian/rules zaptel-1.0.7/debian/rules
--- zaptel-1.0.7/debian/rules
+++ zaptel-1.0.7/debian/rules
@@ -95,12 +95,12 @@
 	install -d debian/tmp/etc
 	install -m 644 zaptel.conf.sample debian/tmp/etc/zaptel.conf
=20
-	install -d -m 644 debian/tmp/usr/share/lintian/overrides/
+	install -d -m 755 debian/tmp/usr/share/lintian/overrides/
 	install -m 644 debian/zaptel.lintian debian/tmp/usr/share/lintian/overrid=
es/zaptel
=20
 	# make sure we do ship some documentation on how to deal with zaphfc
-	install -d -m 644 debian/tmp/usr/share/doc/zaptel/examples/zaphfc
-	install -d -m 644 debian/tmp/usr/share/doc/zaptel/examples/qozap
+	install -d -m 755 debian/tmp/usr/share/doc/zaptel/examples/zaphfc
+	install -d -m 755 debian/tmp/usr/share/doc/zaptel/examples/qozap
 	install -m 644 zaphfc/*.conf* debian/tmp/usr/share/doc/zaptel/examples/za=
phfc
 	install -m 644 qozap/*.conf* debian/tmp/usr/share/doc/zaptel/examples/qoz=
ap
=20
diff -u zaptel-1.0.7/debian/changelog zaptel-1.0.7/debian/changelog
--- zaptel-1.0.7/debian/changelog
+++ zaptel-1.0.7/debian/changelog
@@ -1,3 +1,17 @@
+zaptel (1:1.0.7-4.1) unstable; urgency=3Dhigh
+
+  * Non-maintainer upload.
+  * High-urgency upload for sarge-targetted RC bugfix
+  * Make sure directories are created mode 755 instead of mode 644, as
+    this otherwise causes problems for building (apparently on xfs
+    filesystems).  Closes: #310150.
+  * Tweak debian/patches/Makefile.dpatch fix from the previous NMU so
+    that it isn't unnecessarily fragile: -fsigned-char is *always*
+    either a no-op or required, so lose the architecture checking and
+    enable it unconditionally.  Closes: #305731.
+
+ -- Steve Langasek <vorlon@debian.org>  Sun, 22 May 2005 02:48:44 -0700
+
 zaptel (1:1.0.7-4) unstable; urgency=3Dhigh
=20
   * NMU as VOIP team taking so long. Fix compiler flags so that ztcfg
diff -u zaptel-1.0.7/debian/patches/Makefile.dpatch zaptel-1.0.7/debian/pat=
ches/Makefile.dpatch
--- zaptel-1.0.7/debian/patches/Makefile.dpatch
+++ zaptel-1.0.7/debian/patches/Makefile.dpatch
@@ -27,7 +27,7 @@
  CFLAGS+=3D-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 -CFLAGS+=3D$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; f=
i)
 -CFLAGS+=3D$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
-+CFLAGS+=3D$(shell if echo $(UNAME_M) | grep -q "ppc\|powerpc\|arm\|s390";=
 then echo "-fsigned-char"; fi)
++CFLAGS+=3D-fsigned-char
 +CFLAGS+=3D$(shell if echo $(UNAME_M) | grep -q x86_64; then echo "-m64"; =
fi)
  LCFLAGS=3D-fPIC $(CFLAGS) -DBUILDING_TONEZONE
 -KFLAGS+=3D-I/usr/src/linux-2.4/include -O6

--rW45g2D1DgwV0HVw--

--X6f5cqjOqKjuoPgI
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCkGqmKN6ufymYLloRAjw2AJ99bT+cJWvimX1VvEQyxO6jqokGAwCfda9G
EGhBUjlFAZNm/pYQklRzN6U=
=nq0n
-----END PGP SIGNATURE-----

--X6f5cqjOqKjuoPgI--