Package: xbase-clients
Version: 7.0.0-3
Severity: normal
Tags: patch
Hi,
xbase-clients Build-Depends on ssh | rsh, which means it pulls in
openssh-server and openssh-client into the buildd chroot and generate
new host keys. Something that uses up a lot of entropy and takes a
long time on e.g. m68k.
At a minimum the Build-Depends should be updated to "openssh-client |
ssh | rsh" reflecting the split package. The attached patch goes one
step further and eliminates the need for ssh alltogether by supplying
the path to rsh on the configure call. There is little point trying to
autodetect what we already know to be.
MfG
Goswin
-- System Information:
Debian Release: 3.1
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.8-frosties-2
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
diff -u xbase-clients-7.0.0/debian/changelog
xbase-clients-7.0.0/debian/changelog
--- xbase-clients-7.0.0/debian/changelog
+++ xbase-clients-7.0.0/debian/changelog
@@ -1,3 +1,9 @@
+xbase-clients (1:7.0.0-3c0.mrvn.1) unstable; urgency=low
+
+ * Set RSH=/usr/bin/rsh instead of Build-Depending on ssh | rsh
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]> Sat, 15 Apr 2006 14:10:22 +0000
+
xbase-clients (1:7.0.0-3) unstable; urgency=low
* Remove mention of xorgconfig and xorgcfg in package description. Thanks
diff -u xbase-clients-7.0.0/debian/control xbase-clients-7.0.0/debian/control
--- xbase-clients-7.0.0/debian/control
+++ xbase-clients-7.0.0/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1),
libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1),
libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>=
2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1),
libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>=
1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev
(>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1),
libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), ssh | rsh,
x11proto-gl-dev, libgl1-mesa-dev, xbitmaps
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1),
libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1),
libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>=
2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1),
libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>=
1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev
(>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1),
libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev,
libgl1-mesa-dev, xbitmaps
Standards-Version: 3.6.1.0
Package: xbase-clients
diff -u xbase-clients-7.0.0/debian/rules xbase-clients-7.0.0/debian/rules
--- xbase-clients-7.0.0/debian/rules
+++ xbase-clients-7.0.0/debian/rules
@@ -46,7 +46,7 @@
echo "$$FILE" ; \
mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
(cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
- ../"$$FILE"/configure --prefix=/usr
--mandir=\$${prefix}/share/man \
+ RSH=/usr/bin/rsh ../"$$FILE"/configure --prefix=/usr
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)" && \
$(MAKE)) || exit 1; \
only in patch2:
unchanged:
--- xbase-clients-7.0.0.orig/xsm-X11R7.0-1.0.1/configure
+++ xbase-clients-7.0.0/xsm-X11R7.0-1.0.1/configure
@@ -2915,7 +2915,6 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-RSH=
if [ -z $RSH ] ; then
# Extract the first word of "rsh", so it can be a program name with args.
set dummy rsh; ac_word=$2
only in patch2:
unchanged:
--- xbase-clients-7.0.0.orig/xsm-X11R7.0-1.0.1/configure.ac
+++ xbase-clients-7.0.0/xsm-X11R7.0-1.0.1/configure.ac
@@ -31,7 +31,6 @@
AC_PROG_CC
AC_PROG_INSTALL
-RSH=
if [[ -z $RSH ]] ; then
AC_PATH_PROG(RSH,rsh)
fi
