Revision bump, fixing bug #222513, bug #223333, bug #230769 and bug #227013.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

7 files changed, 60 insertions, 95 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ec0d726ed9fb..d119663d9095 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.314 2008/06/15 01:14:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.315 2008/07/16 22:47:37 tgurr Exp $
+
+*cups-1.3.7-r3 (16 Jul 2008)
+
+  16 Jul 2008; Timo Gurr <tgurr@gentoo.org> -files/cups-1.2.0-bindnow.patch,
+  -files/cups-1.3.7-peercred.patch, +files/cups-1.3.7-str2860.patch,
+  cups-1.2.12-r4.ebuild, -cups-1.3.7-r2.ebuild, +cups-1.3.7-r3.ebuild:
+  Revision bump, fixing bug #222513, bug #223333, bug #230769 and bug
+  #227013.
 
   14 Jun 2008; Zac Medico <zmedico@gentoo.org> cups-1.2.12-r4.ebuild,
   cups-1.2.12-r7.ebuild, cups-1.2.12-r8.ebuild, cups-1.3.7-r1.ebuild,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 550d183c73bc..c4ed0944d2a3 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,7 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX cups-1.2.0-bindnow.patch 2178 RMD160 cdf51a6734c7a38fab33f270c7c374445a934321 SHA1 5406422e6b92c571f636d521baee354f84fafc2d SHA256 0fffd86557fdfbf85e32781d1b77f9696e5f0ed7eb30a78fb57ca82cfafdc190
 AUX cups-1.2.12-CVE-2007-4045.patch 1737 RMD160 6c239b26443af6cf841a457cc5611a2f78d809c3 SHA1 02c2bd1bf58204fd9e1b380f8899dae2f98c2fed SHA256 0e4898b7e42f74f894b416a1398d75bcf6062497a87e061984f09e904f68489e
 AUX cups-1.2.12-CVE-2007-4351.patch 3910 RMD160 461a232b2a0ebc52a83cb729112c0f7d3f3d0ffe SHA1 9b7706a34fd08c32b7911a9f09f02a02c790a77c SHA256 1da64de6358dea65971105530795ffb8d100ddfe5b42c03cdbd815432de219c8
 AUX cups-1.2.12-CVE-2007-5849.patch 1017 RMD160 0fd58946d8cfca13460ad07bfde670a3319fe1ff SHA1 4c4cb69d857427de43b5b91b5aceb7cb157be530 SHA256 9288292457f8c8de77b04eab651b547dd6506a03453ed93294577e2fb4f3c67b
@@ -13,24 +9,17 @@ AUX cups-1.2.12-CVE-2008-1722.patch 1457 RMD160 5c887ad9b824c1e41f7a4894f757d03f
 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
 AUX cups-1.3.7-CVE-2008-1722.patch 1752 RMD160 25dd7948f4a3c8ac0f39b33387e79195b104bf1d SHA1 309d26918fc11619a97b3f560662478437d97a54 SHA256 d372a4595f52ccd88deb5545f64b70c3dbf8a6e9bec7524b6ac32c59cb131749
 AUX cups-1.3.7-backend-https.patch 450 RMD160 9a1ad48d2be40c89510ccc512649f0a2eb5543b0 SHA1 d3dd55fcdee47855d6b7c1443adb6c2b3d8c9cdb SHA256 060f929ae3eae5dc411ce6352a0d50c3296b013974f034fc2ad8d6bb0c81b45a
-AUX cups-1.3.7-peercred.patch 350 RMD160 1f7025a28bcba9a394bc6744afda9759a6d40343 SHA1 2c82cf1e06f9d3be5bae6fdd11cc5924072fd132 SHA256 3564daff966c12db738bbda3e5443883217c5a4407d50144c09d5d9f98ba4711
 AUX cups-1.3.7-str2750.patch 365 RMD160 4cffde801c811b52683ea6c9811c2349295620ca SHA1 d0df41aa310dedd12ae4210654ed788e0d762cd2 SHA256 8e052687c6bfb5f117baacaa10826a3327db26f193991d3dab6fb27678bbc522
+AUX cups-1.3.7-str2860.patch 568 RMD160 1c1c20279bc922f59e3ee273f4e9a912d069a09d SHA1 97c9f96236161e4a9ba1acb65c9a44e5dc0e9781 SHA256 68e994dbfb8f9c3eeb0ad63fed61e03bc7e102f31df10cbe278ee7838b053ef1
 AUX cupsd.init 288 RMD160 9bd676af5b43a97ba08ca51f70cefb445faeb8b8 SHA1 922868e1a6acb81b83e87a3c6905149789f16503 SHA256 008eeadc4979ad0e1f05e8ce5d22449eb798375e75ffc3176cbef138a53de4f9
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.2.12-source.tar.bz2 3788301 RMD160 598270e37ff8a9b9ff1e667066d6f7e120493e32 SHA1 11a540f76a1d3164b6636bf8ba47928803ad9356 SHA256 b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f
 DIST cups-1.3.7-source.tar.bz2 3895825 RMD160 7d3bd9dbe91e787f7032b770e576ab31cfcf6588 SHA1 4267822cdad2fdad44ff0885587132250bcf8dff SHA256 1c8bb310131498934657651fb0ea3e44b4f6d0243ba2ad252644a8f039dda0fe
-EBUILD cups-1.2.12-r4.ebuild 7171 RMD160 eebee124d8b1946cda2386ecca45da1e3944af94 SHA1 2d11df0c68e26e09ae5b54aa3b202c38514885a5 SHA256 530412053fd356ddb84553e99bae343f72eee3f6ee55da718403775b5eeb4ae2
+EBUILD cups-1.2.12-r4.ebuild 7030 RMD160 4ec61a70c3083168ed6b52cd0d1fba061527f911 SHA1 6446066e419f2970ddbd4316e57572954ea3ff4c SHA256 f7a592fd58ff1b72f5e7809175a968b00e16b1bd81af4a9412dce6abbdc1701b
 EBUILD cups-1.2.12-r7.ebuild 7314 RMD160 c6571ff1a1b3afeda21abdf5d7d4607ecbc76cad SHA1 6df0db0117f502ee889d4456cc17e5af10c05c12 SHA256 f15c11ae4e20d55ced89e52618a70457fc8182c5cde94618293d71931dcb6a98
 EBUILD cups-1.2.12-r8.ebuild 7416 RMD160 7d1e6b67af75ff60d5c488408e68da23f57061f3 SHA1 08de0991b1f65616d70db2c18b7223a1c7095742 SHA256 41d4a04d0bbe3c215f87070662128b529197795076ce65943f86047d6066d28b
 EBUILD cups-1.3.7-r1.ebuild 8340 RMD160 3a9c75d00b566c521c0d89a6e9646ef5b342f5d7 SHA1 e3d46179ffb83d79c6f0182930eb9447171796d8 SHA256 28d1fdf8b5469d8eea0c6af36cc41a4cd1e3a14686727a1e99d85c91163e35b8
-EBUILD cups-1.3.7-r2.ebuild 8577 RMD160 d40e78be68f5aba804af1379aea727c9fb78322f SHA1 a0bbb42bcd12f5a1fe1d2081665c31ee25a8cf3e SHA256 072543c38d34e018a871bd7bb029672e4121d9f4fd8b40d4c60ea04f7e5cd00c
-MISC ChangeLog 45990 RMD160 3b0b68f77a37d9e044d1ea2b381af7d74f2fb43f SHA1 f084c73d9b5414c328e4cbc6fae0423ef394f4f2 SHA256 1f96b605d3102a39673ae6b4ae6917b4f769137d28de5827471455cbc6fa7691
+EBUILD cups-1.3.7-r3.ebuild 8908 RMD160 91147c21b6b434a1510ca9be295ba35d1b8aa53c SHA1 413edd263348cb6d382148b2089a93849466d0b7 SHA256 8964937fb867d4afbd6b58dc73c1a3ec08d056b1ab617516f3b155fb05bd086a
+MISC ChangeLog 46317 RMD160 11cadc1e6f08eae504c2f55a734c422e2224eda6 SHA1 2ab769d41c897e01459b68c7982b9fee478b3fff SHA256 84d521b02faca1445198089155821c407caba3534677e0ddc9936685b50a30d0
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhUbOkACgkQ/ejvha5XGaP0bgCg1UtWZbVXmKYQGyzFq6JC+mCi
-slwAnRyaIr7hQ7LTjLT5MzvckAVIng5D
-=qOGp
------END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.2.12-r4.ebuild b/net-print/cups/cups-1.2.12-r4.ebuild
index adf712bcfb32..562a8b79a17e 100644
--- a/net-print/cups/cups-1.2.12-r4.ebuild
+++ b/net-print/cups/cups-1.2.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,v 1.6 2008/06/15 01:14:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,v 1.7 2008/07/16 22:47:37 tgurr Exp $
 
 WANT_AUTOMAKE=latest
 
@@ -81,9 +81,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# upstream does not acknowledge bindnow as a solution
-	epatch "${FILESDIR}"/cups-1.2.0-bindnow.patch
-
 	# CVE-2007-4045 security patch, bug #199195
 	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4045.patch
 	# CVE-2007-4351 security patch, bug #196736
@@ -109,7 +106,6 @@ src_compile() {
 		--with-system-groups=lpadmin \
 		--localstatedir=/var \
 		--with-docdir=/usr/share/cups/html \
-		--with-bindnow=$(bindnow-flags) \
 		$(use_enable pam) \
 		$(use_enable ssl) \
 		--enable-gnutls \
diff --git a/net-print/cups/cups-1.3.7-r2.ebuild b/net-print/cups/cups-1.3.7-r3.ebuild
index e219bb610bde..3920cd0c5ee3 100644
--- a/net-print/cups/cups-1.3.7-r2.ebuild
+++ b/net-print/cups/cups-1.3.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.7-r2.ebuild,v 1.2 2008/06/15 01:14:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.7-r3.ebuild,v 1.1 2008/07/16 22:47:37 tgurr Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -13,11 +13,12 @@ SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="acl avahi dbus java jpeg kerberos ldap nls pam perl php png ppds python samba slp ssl static tiff X zeroconf"
+IUSE="acl avahi dbus gnutls java jpeg kerberos ldap nls pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
 
 COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
 	java? ( >=virtual/jre-1.4 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	kerberos? ( virtual/krb5 )
@@ -28,8 +29,9 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	python? ( dev-lang/python )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? ( net-libs/gnutls )
+	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
 	tiff? ( >=media-libs/tiff-3.5.5 )
+	xinetd? ( sys-apps/xinetd )
 	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
 	app-text/libpaper
 	dev-libs/libgcrypt"
@@ -103,11 +105,11 @@ src_unpack() {
 	# CVE-2008-1722 security patch, bug #217232
 	epatch "${FILESDIR}/${PN}-1.3.7-CVE-2008-1722.patch"
 
-	# fix compilation against glibc-2.8, bug #225421
-	epatch "${FILESDIR}/${PN}-1.3.7-peercred.patch"
-
-	# fix IPP authentification, upstream bug STR #2750 (already fixed in CUPS SVN)
+	# Already fixed in CUPS SVN
+	# fix IPP authentification, upstream bug STR #2750
 	epatch "${FILESDIR}/${PN}-1.3.7-str2750.patch"
+	# fix compilation against glibc-2.8, upstream bug STR #2860
+	epatch "${FILESDIR}/${PN}-1.3.7-str2860.patch"
 
 	# cups does not use autotools "the usual way" and ship a static config.h.in
 	eaclocal
@@ -139,6 +141,16 @@ src_compile() {
 		myconf="${myconf} --disable-dnssd"
 	fi
 
+	if use ssl || use gnutls ; then
+		myconf="${myconf} \
+			$(use_enable gnutls) \
+			$(use_enable !gnutls openssl)"
+	else
+		myconf="${myconf} \
+			--disable-gnutls \
+			--disable-openssl"
+	fi
+
 	econf \
 		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \
@@ -147,23 +159,21 @@ src_compile() {
 		--with-docdir=/usr/share/cups/html \
 		--with-languages=${LINGUAS} \
 		--with-system-groups=lpadmin \
+		--with-xinetd=/etc/xinetd.d \
 		$(use_enable acl) \
 		$(use_enable dbus) \
 		$(use_enable jpeg) \
 		$(use_enable kerberos gssapi) \
 		$(use_enable ldap) \
-		$(use_enable nls) \
 		$(use_enable pam) \
 		$(use_enable png) \
 		$(use_enable slp) \
-		$(use_enable ssl) \
 		$(use_enable static) \
 		$(use_enable tiff) \
 		$(use_with java) \
 		$(use_with perl) \
 		$(use_with php) \
 		$(use_with python) \
-		--enable-gnutls \
 		--enable-libpaper \
 		--enable-threads \
 		--disable-pdftops \
@@ -198,17 +208,21 @@ src_install() {
 	# install our pam script
 	pamd_mimic_system cups auth account
 
-	# correct path
-	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd
-	# it is safer to disable this by default, bug 137130
-	grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
-		sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
+	if use xinetd ; then
+		# correct path
+		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
+			sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
+	else
+		rm -rf "${D}"/etc/xinetd.d
+	fi
 
 	# install pdftops filter
 	exeinto /usr/libexec/cups/filter/
 	newexe "${FILESDIR}"/pdftops-1.20.gentoo pdftops
 
-	# only for gs-esp this is correct, see bug 163897
+	# only for gs-esp this is correct, see bug #163897
 	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu ; then
 		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
 	fi
diff --git a/net-print/cups/files/cups-1.2.0-bindnow.patch b/net-print/cups/files/cups-1.2.0-bindnow.patch
deleted file mode 100644
index eb1b14e96ba8..000000000000
--- a/net-print/cups/files/cups-1.2.0-bindnow.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/config-scripts/cups-setXid.m4 cups-1.2.0/config-scripts/cups-setXid.m4
---- cups-1.2.0.orig/config-scripts/cups-setXid.m4	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.2.0/config-scripts/cups-setXid.m4	2006-05-08 23:50:22.000000000 +0200
-@@ -0,0 +1,9 @@
-+dnl
-+dnl   Copyright 1999-2005 Gentoo Foundation
-+dnl   Distributed under the terms of the GNU General Public License v2
-+dnl
-+
-+AC_ARG_WITH(bindnow, [  --with-bindnow          Set linker flags for force-binding setuid binaries],
-+	BINDNOW_FLAGS="$withval",
-+	BINDNOW_FLAGS="")
-+AC_SUBST(BINDNOW_FLAGS)
-diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/configure.in cups-1.2.0/configure.in
---- cups-1.2.0.orig/configure.in	2006-05-08 23:50:10.000000000 +0200
-+++ cups-1.2.0/configure.in	2006-05-08 23:50:22.000000000 +0200
-@@ -46,6 +46,7 @@ sinclude(config-scripts/cups-defaults.m4
- sinclude(config-scripts/cups-pap.m4)
- sinclude(config-scripts/cups-pdf.m4)
- sinclude(config-scripts/cups-scripting.m4)
-+sinclude(config-scripts/cups-setXid.m4)
- 
- LANGFILES=""
- if test "x$LANGUAGES" != x; then
-diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/Makedefs.in cups-1.2.0/Makedefs.in
---- cups-1.2.0.orig/Makedefs.in	2006-05-08 23:50:10.000000000 +0200
-+++ cups-1.2.0/Makedefs.in	2006-05-08 23:50:44.000000000 +0200
-@@ -131,6 +131,7 @@ IMGLIBS		=	@IMGLIBS@ -lm
- IMGFILTERS	=	@IMGFILTERS@
- LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
- 			@LDFLAGS@ @PIEFLAGS@ $(OPTIM)
-+BINDNOW_FLAGS	=	@BINDNOW_FLAGS@
- LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
- LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
- LIBS		=	$(LINKCUPS) $(COMMONLIBS)
-diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/systemv/Makefile cups-1.2.0/systemv/Makefile
---- cups-1.2.0.orig/systemv/Makefile	2006-05-08 23:50:10.000000000 +0200
-+++ cups-1.2.0/systemv/Makefile	2006-05-08 23:50:22.000000000 +0200
-@@ -205,7 +205,7 @@ lpoptions:	lpoptions.o ../cups/$(LIBCUPS
- 
- lppasswd:	lppasswd.o ../cups/$(LIBCUPS)
- 	echo Linking $@...
--	$(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
-+	$(CC) $(LDFLAGS) $(BINDNOW_FLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
- 
- 
- #
diff --git a/net-print/cups/files/cups-1.3.7-peercred.patch b/net-print/cups/files/cups-1.3.7-peercred.patch
deleted file mode 100644
index eda2c93a6766..000000000000
--- a/net-print/cups/files/cups-1.3.7-peercred.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cups-1.3.7/scheduler/auth.c cups-1.3.7.new/scheduler/auth.c
---- cups-1.3.7/scheduler/auth.c	2008-03-20 21:58:16.000000000 +0100
-+++ cups-1.3.7.new/scheduler/auth.c	2008-06-09 14:53:45.535194741 +0200
-@@ -54,6 +54,7 @@
-  * Include necessary headers...
-  */
- 
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include <grp.h>
- #ifdef HAVE_SHADOW_H
diff --git a/net-print/cups/files/cups-1.3.7-str2860.patch b/net-print/cups/files/cups-1.3.7-str2860.patch
new file mode 100644
index 000000000000..597225a8b112
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.7-str2860.patch
@@ -0,0 +1,16 @@
+diff -Naur cups-1.3.7/config-scripts/cups-compiler.m4 cups-1.3.7.new/config-scripts/cups-compiler.m4
+--- cups-1.3.7/config-scripts/cups-compiler.m4	2008-02-28 01:54:04.000000000 +0100
++++ cups-1.3.7.new/config-scripts/cups-compiler.m4	2008-07-02 23:54:33.915981796 +0200
+@@ -521,6 +521,12 @@
+ 		OPTIM="$OPTIM -D_HPUX_SOURCE"
+ 		;;
+ 
++	Linux*)
++		# glibc 2.8 and higher breaks peer credentials unless you
++		# define _GNU_SOURCE...
++		OPTIM="$OPTIM -D_GNU_SOURCE"
++		;;
++
+ 	OSF*)
+ 		# Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told
+ 		# to be POSIX-compliant...