Your message dated Sun, 04 Apr 2010 13:50:53 +0000
with message-id <[email protected]>
and subject line Bug#565539: fixed in sash 3.7-10
has caused the Debian Bug report #565539,
regarding sash: FTBFS on kfreebsd
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 [email protected]
immediately.)
--
565539: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565539
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: sash
Version: 3.7-9
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd
sash FTBFS on GNU/kFreeBSD, mostly due to a Linux specific build
configuration:
make[1]: Entering directory `/home/abe/debian/sash-3.7'
cc -O3 -Wall -Wmissing-prototypes -g -DHAVE_GZIP=1 -DHAVE_LINUX_ATTR=1
-DHAVE_LINUX_MOUNT=1 -DHAVE_BSD_MOUNT=0 -DMOUNT
_TYPE='"ext3"' -DHAVE_GZIP=1 -DHAVE_LINUX_ATTR=1 -DHAVE_LINUX_MOUNT=1
-DHAVE_BSD_MOUNT=0 -DMOUNT_TYPE='"ext3"' -c sash
.c
cc -O3 -Wall -Wmissing-prototypes -g -DHAVE_GZIP=1 -DHAVE_LINUX_ATTR=1
-DHAVE_LINUX_MOUNT=1 -DHAVE_BSD_MOUNT=0 -DMOUNT
_TYPE='"ext3"' -DHAVE_GZIP=1 -DHAVE_LINUX_ATTR=1 -DHAVE_LINUX_MOUNT=1
-DHAVE_BSD_MOUNT=0 -DMOUNT_TYPE='"ext3"' -c cmds
.c
cmds.c:21:22: error: linux/fs.h: No such file or directory
cmds.c: In function ‘do_mount’:
cmds.c:518: error: ‘MS_MGC_VAL’ undeclared (first use in this function)
cmds.c:518: error: (Each undeclared identifier is reported only once
cmds.c:518: error: for each function it appears in.)
cmds.c:544: error: ‘MS_RDONLY’ undeclared (first use in this function)
cmds.c:548: error: ‘MS_REMOUNT’ undeclared (first use in this function)
cmds.c:552: error: ‘MS_NOSUID’ undeclared (first use in this function)
cmds.c:556: error: ‘MS_NOEXEC’ undeclared (first use in this function)
cmds.c:588: warning: passing argument 3 of ‘mount’ makes integer from pointer
without a cast
/usr/include/sys/mount.h:326: note: expected ‘int’ but argument is of type
‘const char *’
cmds.c:588: warning: passing argument 4 of ‘mount’ makes pointer from integer
without a cast
/usr/include/sys/mount.h:326: note: expected ‘void *’ but argument is of type
‘int’
cmds.c:588: error: too many arguments to function ‘mount’
cmds.c: In function ‘do_umount’:
cmds.c:637: warning: implicit declaration of function ‘umount’
make[1]: *** [cmds.o] Error 1
make[1]: Leaving directory `/home/abe/debian/sash-3.7'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
The following patch should fix the build under GNU/kFreeBSD without
affecting the build under Linux. It may even fix the FTBFS on
GNU/Hurd (see https://buildd.debian.org/sash), too.
diff -ru sash-3.7/cmds.c sash-3.7+kbsd/cmds.c
--- sash-3.7/cmds.c 2010-01-16 19:13:42.000000000 +0100
+++ sash-3.7+kbsd/cmds.c 2010-01-16 19:14:36.000000000 +0100
@@ -19,6 +19,10 @@
#if HAVE_LINUX_MOUNT
#include <linux/fs.h>
+#elif HAVE_BSD_MOUNT
+#include <ufs/ufs/ufsmount.h>
+#include <fs/cd9660/cd9660_mount.h>
+#include <fs/msdosfs/msdosfsmount.h>
#endif
@@ -591,26 +595,16 @@
#elif HAVE_BSD_MOUNT
{
struct ufs_args ufs;
- struct adosfs_args adosfs;
struct iso_args iso;
- struct mfs_args mfs;
struct msdosfs_args msdosfs;
void * args;
if(!strcmp(type, "ffs") || !strcmp(type, "ufs")) {
ufs.fspec = (char*) argv[0];
args = &ufs;
- } else if(!strcmp(type, "adosfs")) {
- adosfs.fspec = (char*) argv[0];
- adosfs.uid = 0;
- adosfs.gid = 0;
- args = &adosfs;
} else if(!strcmp(type, "cd9660")) {
iso.fspec = (char*) argv[0];
args = &iso;
- } else if(!strcmp(type, "mfs")) {
- mfs.fspec = (char*) argv[0];
- args = &mfs;
} else if(!strcmp(type, "msdos")) {
msdosfs.fspec = (char*) argv[0];
msdosfs.uid = 0;
diff -ru sash-3.7/debian/control sash-3.7+kbsd/debian/control
--- sash-3.7/debian/control 2010-01-16 19:13:42.000000000 +0100
+++ sash-3.7+kbsd/debian/control 2010-01-16 19:18:43.000000000 +0100
@@ -3,7 +3,9 @@
Priority: optional
Maintainer: Tollef Fog Heen <[email protected]>
Standards-Version: 3.8.0
-Build-Depends: zlib1g-dev (>= 1:1.2.2-7), debhelper (>= 7), e2fslibs-dev
+Build-Depends: zlib1g-dev (>= 1:1.2.2-7), debhelper (>= 7),
+ e2fslibs-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ kfreebsd-kernel-headers [kfreebsd-amd64 kfreebsd-i386]
Package: sash
Architecture: any
diff -ru sash-3.7/Makefile sash-3.7+kbsd/Makefile
--- sash-3.7/Makefile 2010-01-16 19:13:42.000000000 +0100
+++ sash-3.7+kbsd/Makefile 2010-01-16 19:48:52.000000000 +0100
@@ -9,9 +9,16 @@
#
HAVE_GZIP = 1
HAVE_LINUX_ATTR = 1
+ifeq (, $(filter Linux,$(shell uname -s)))
HAVE_LINUX_MOUNT = 1
HAVE_BSD_MOUNT = 0
MOUNT_TYPE = '"ext3"'
+endif
+ifeq (, $(filter kFreeBSD,$(shell uname -s)))
+HAVE_LINUX_MOUNT = 0
+HAVE_BSD_MOUNT = 1
+MOUNT_TYPE = '"ufs"'
+endif
DEFS = -DHAVE_GZIP=$(HAVE_GZIP) \
-DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (990, 'unstable'), (600, 'testing'), (110, 'experimental')
Architecture: kfreebsd-i386 (i686)
Kernel: kFreeBSD 8.0-1-686-smp
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
sash depends on no packages.
sash recommends no packages.
Versions of packages sash suggests:
pn doc-debian <none> (no description available)
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: sash
Source-Version: 3.7-10
We believe that the bug you reported is fixed in the latest version of
sash, which is due to be installed in the Debian FTP archive:
sash_3.7-10.debian.tar.gz
to main/s/sash/sash_3.7-10.debian.tar.gz
sash_3.7-10.dsc
to main/s/sash/sash_3.7-10.dsc
sash_3.7-10_amd64.deb
to main/s/sash/sash_3.7-10_amd64.deb
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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Tollef Fog Heen <[email protected]> (supplier of updated sash 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 04 Apr 2010 10:25:57 +0200
Source: sash
Binary: sash
Architecture: source amd64
Version: 3.7-10
Distribution: unstable
Urgency: low
Maintainer: Tollef Fog Heen <[email protected]>
Changed-By: Tollef Fog Heen <[email protected]>
Description:
sash - Stand-alone shell
Closes: 281728 565539
Changes:
sash (3.7-10) unstable; urgency=low
.
* Switch to 3.0 (quilt) as the source format and convert patches.
* Fix up debian/patches/touch_error_handling to actually update the
timestamp of the file, something that has been broken for more than
ten years.
* Add kFreeBSD build fixes from Axel Beckert. Closes: #565539
* When exiting the shell, use the exit status of the last command as our
exit status. Closes: #281728
Checksums-Sha1:
2367fbc5581c01b6f4611124aee8c6ddfab5411a 1706 sash_3.7-10.dsc
f3062a3e50d35dbfd436455084c3eb5996382d75 23749 sash_3.7-10.debian.tar.gz
1f13d86e5a5815af8880bc912691ab5b93d8c066 380540 sash_3.7-10_amd64.deb
Checksums-Sha256:
f6b119353fada42c1397415d72c5b0773ae2ba2931963e58c61eceb7b2f77de3 1706
sash_3.7-10.dsc
8275b4b5542439df9b262d642b70d8121387046bd41aa88d7c3acc7c10815e31 23749
sash_3.7-10.debian.tar.gz
5abe630ce868c5c88816cc65b1a66302db89b34e24cb2a4de8b70dc13932993e 380540
sash_3.7-10_amd64.deb
Files:
a0530197e436b66d97de36a11ae7fd17 1706 shells optional sash_3.7-10.dsc
dacf35476d6e4c35d606a8d91e8f24f4 23749 shells optional
sash_3.7-10.debian.tar.gz
e2cc0e9dc6911e3bb30c843e077d3123 380540 shells optional sash_3.7-10_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJLuI3EAAoJELZaSHHKGdcXJC4QAMkVvAFtGq86xYUPN6s3YuQo
4I5Wu/NBNdJZ2HpYpAvR81pKb07yu0hW6HYGvFBMmwFrV8AQzJNnRJ0oBQmW/eF0
OKyIUM2urAzv8rz/yHPeEIqjfdWU3D7jQd2cSdDUo6mbZpROLea529s66nbCWAPf
Hfh1qDGckCPFj9vWTmfMkvap/hSmFjEovDaGNsa4+x4FgbEm1JE46SJVcGlScbSJ
9/dnV4KFJSyOs5l2/96z/Of67l06TBSV2k0cJVyQBdYhy3TOgO0KlOIL7CySrknS
TB99QT4iJ3nEVA19rYJpEhoHmalX4ld/+F+3Zy1Ak64NyawwIJ7NGnhE03DLjj5l
eKqQCRV3M+kT8FFBt7c2v/mdy+GJtER7SQ4hKu4A8/7sJDeZhtxLAQTrvI2pqtb2
gFDhE6r9ToMVGrU+4JhCMirgi2ps5lDJoNGOJB2RIAMv43OdkbfuXRSj8cvAwetg
r5tqcqNpVvLKQMB08omFnnhIazZAO7HXgYoopypbl8Vmx4MPmKxoz33lQ+oj5UBE
rWoo3sF80CVmDRS7TdftcM2yW740vXjqBcK2Qayqfy8iOfpjwaG+DLsgLNq6mcx0
eeTrBKjbB0hDMhoL4bQ9DWQf1Tehjy+CbM0BH8nTE0Gg5y0Gy5VPvGYd1DhMMxwh
8PVQrkzP0fvjc9QZE7Xv
=i8OP
-----END PGP SIGNATURE-----
--- End Message ---
