Package: coreutils
Version: 5.2.1-2.1
Severity: minor
Tags: patch
The first patch follows (touches debian/rules and
man/Makefile.am):
--- coreutils-5.2.1/debian/patches/60_cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ coreutils-5.2.1-2.1.my/debian/patches/60_cross.patch 2006-03-06
17:23:34.000000000 +0100
@@ -0,0 +1,36 @@
+--- coreutils-5.2.1/build-tree/coreutils-5.2.1/man/Makefile.am 2004-01-23
16:54:23.000000000 +0100
++++ coreutils-5.2.1/man/Makefile.am 2006-03-06 17:03:09.000000000 +0100
+@@ -128,11 +128,14 @@
+ @rm -f $@
+ @echo "Updating man page $@"; \
+ mkdir $t; \
+- (cd $t && $(LN_S) ../../src/$(mapped_name)$(EXEEXT) $*$(EXEEXT)); \
++ (cd $t;\
++ for x in /bin /usr/bin /sbin /usr/sbin; do\
++ [ -x $$x/$*$(EXEEXT) ] && $(LN_S) $$x/$*$(EXEEXT) $*$(EXEEXT); \
++ done );\
+ $(PERL) -- $(srcdir)/help2man \
+ --info-page='$(PACKAGE) $*' \
+ --include=$(srcdir)/$*.x \
+- --output=$@ $t/$*$(EXEEXT)
++ --output=$@ $t/$*$(EXEEXT) || touch $@
+ @chmod a-w $@
+ @rm -rf $t
+
+@@ -147,7 +150,6 @@
+ # corresponding .1 file in the definition of $(dist_man_MANS) above.
+ .PHONY: check-x-vs-1
+ check-x-vs-1:
+- PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
+ t=ls-files.$$$$; \
+ (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
+ echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//' \
+@@ -157,7 +159,7 @@
+ programs = \
+ echo 'spy:;@echo $$(all_programs)' \
+ | MAKEFLAGS= $(MAKE) -s -C ../src -f Makefile -f - spy \
+- | ../src/tr -s ' ' '\n' | $(ASSORT) -u | grep -v '\['
++ | tr -s ' ' '\n' | $(ASSORT) -u | grep -v '\['
+
+ .PHONY: check-programs-vs-x
+ check-programs-vs-x:
--- coreutils-5.2.1/debian/rules 2006-03-06 12:57:28.000000000 +0100
+++ coreutils-5.2.1-2.1.my/debian/rules 2006-03-06 17:02:42.000000000 +0100
@@ -63,7 +63,9 @@
dh_testdir
cd $(BUILD_TREE) && $(MAKE)
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
cd $(BUILD_TREE) && $(MAKE) check
+endif
touch build-stamp
There more problems concerning build and install of EXTRA_PROGRAMS,
missing fsusage.o and getloadavg.o in Makefile, and wrong config.h
settings. Here is the intermediate patch that has to be applied after
failing debian/rules build (uses Makefile's, not Makefile.in or
Makefile.am):
--- coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/src/Makefile.orig
2006-03-13 13:17:46.000000000 +0100
+++ coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/src/Makefile
2006-03-13 13:18:32.000000000 +0100
@@ -171,7 +171,7 @@
am__EXEEXT_2 =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(EXTRA_PROGRAMS)
am___OBJECTS = lbracket.$(OBJEXT)
__OBJECTS = $(am___OBJECTS)
__LDADD = $(LDADD)
@@ -905,10 +905,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-binPROGRAMS: $(bin_PROGRAMS) $(EXTRA_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ @list='$(bin_PROGRAMS) $(EXTRA_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
; then \
@@ -920,17 +920,17 @@
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ @list='$(bin_PROGRAMS) $(EXTRA_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed
's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ -test -z "$(bin_PROGRAMS) $(EXTRA_PROGRAMS)" || rm -f $(bin_PROGRAMS)
$(EXTRA_PROGRAMS)
-installcheck-binPROGRAMS: $(bin_PROGRAMS)
- bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
+installcheck-binPROGRAMS: $(bin_PROGRAMS) $(EXTRA_PROGRAMS)
+ bad=0; pid=$$$$; list="$(bin_PROGRAMS) $(EXTRA_PROGRAMS)"; for p in
$$list; do \
case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
*" $$p "* | *" $(srcdir)/$$p "*) continue;; \
esac; \
--- coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/lib/Makefile.orig
2006-03-13 13:17:40.000000000 +0100
+++ coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/lib/Makefile
2006-03-13 13:17:56.000000000 +0100
@@ -171,7 +171,7 @@
canon-host.$(OBJEXT) cloexec.$(OBJEXT) closeout.$(OBJEXT) \
cycle-check.$(OBJEXT) diacrit.$(OBJEXT) dirname.$(OBJEXT) \
dup-safer.$(OBJEXT) exclude.$(OBJEXT) exitfail.$(OBJEXT) \
- filemode.$(OBJEXT) file-type.$(OBJEXT) fopen-safer.$(OBJEXT) \
+ filemode.$(OBJEXT) file-type.$(OBJEXT) fopen-safer.$(OBJEXT)
fsusage.$(OBJEXT)\
fts.$(OBJEXT) full-read.$(OBJEXT) full-write.$(OBJEXT) \
gettime.$(OBJEXT) getugroups.$(OBJEXT) hard-locale.$(OBJEXT) \
human.$(OBJEXT) idcache.$(OBJEXT) isdir.$(OBJEXT) \
--- coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/lib/Makefile.orig
2006-03-13 13:40:50.000000000 +0100
+++ coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/lib/Makefile
2006-03-13 13:39:40.000000000 +0100
@@ -165,7 +165,7 @@
am__DEPENDENCIES_2 =
am_libfetish_a_OBJECTS = acl.$(OBJEXT) getdate.$(OBJEXT) \
posixtm.$(OBJEXT) posixver.$(OBJEXT) strftime.$(OBJEXT) \
- getopt.$(OBJEXT) getopt1.$(OBJEXT) hash.$(OBJEXT) \
+ getloadavg.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) hash.$(OBJEXT) \
hash-pjw.$(OBJEXT) addext.$(OBJEXT) argmatch.$(OBJEXT) \
backupfile.$(OBJEXT) basename.$(OBJEXT) c-strtod.$(OBJEXT) \
canon-host.$(OBJEXT) cloexec.$(OBJEXT) closeout.$(OBJEXT) \
--- coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/config.h.orig
2006-03-13 13:48:11.000000000 +0100
+++ coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/config.h 2006-03-13
13:48:22.000000000 +0100
@@ -80,7 +80,7 @@
/* Define to 1 if the `getloadavg' function needs to be run setuid or setgid.
*/
-/* #undef GETLOADAVG_PRIVILEGED */
+#define GETLOADAVG_PRIVILEGED 1
/* Define if gettimeofday clobbers localtime's static buffer. */
#define GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER 1
@@ -442,7 +442,7 @@
/* #undef HAVE_GETHRTIME */
/* Define to 1 if you have the `getloadavg' function. */
-/* #undef HAVE_GETLOADAVG */
+#undef HAVE_GETLOADAVG
/* Define to 1 if you have the `getmntent' function. */
#define HAVE_GETMNTENT 1
@@ -937,7 +937,7 @@
/* #undef HAVE_STRUCT_UTMP_UT_TYPE */
/* Define to 1 if `ut_user' is member of `struct utmp'. */
-/* #undef HAVE_STRUCT_UTMP_UT_USER */
+#define HAVE_STRUCT_UTMP_UT_USER 1
/* Define to 1 if you have the `strverscmp' function. */
/* #undef HAVE_STRVERSCMP */
@@ -1104,7 +1104,7 @@
/* #undef HAVE_UTMPXNAME */
/* FIXME */
-#define HAVE_UTMPX_H 1
+#undef HAVE_UTMPX_H
/* Define to 1 if you have the <utmp.h> header file. */
#define HAVE_UTMP_H 1
@@ -1329,7 +1329,7 @@
/* #undef STAT_STATFS4 */
/* Define if there is a function named statvfs. (SVR4) */
-/* #undef STAT_STATVFS */
+#define STAT_STATVFS 1
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
--- coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/src/Makefile.orig
2006-03-13 14:16:52.000000000 +0100
+++ coreutils-5.2.1-2.1.my/build-tree/coreutils-5.2.1/src/Makefile
2006-03-13 14:16:54.000000000 +0100
@@ -661,7 +661,7 @@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -lacl
SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \
$(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.13-rc3
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages coreutils depends on:
ii libacl1 2.2.35-1 Access control list shared library
ii libc6 2.3.6-3 GNU C Library: Shared libraries an
coreutils recommends no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
