Version bump.

6 files changed, 179 insertions, 9 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 7541f7529e00..daa939d1bdb0 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/man
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.61 2004/12/13 19:53:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.62 2004/12/13 20:26:58 vapier Exp $
+
+*man-1.5o_p1 (13 Dec 2004)
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  files/man-1.5m-security.patch, +files/man-1.5o_p1-man2html-CFLAGS.patch,
+  +man-1.5o_p1.ebuild:
+  Version bump.
 
   13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
   +files/man-1.5m-cross-compile.patch, man-1.5m-r2.ebuild:
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 676e50e4dce3..4017b412c0b2 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 39f796fca084e1b3029f33b01c833c37 ChangeLog 9026
+MD5 1cd8da05f06456fb0af357ec6718ac4a ChangeLog 9219
+MD5 485a10aeed356a8deac997826eb12900 man-1.5o_p1.ebuild 4108
 MD5 0d992f673099cf324661d15b1d6a4578 man-1.5m-r2.ebuild 4277
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 295a1076025b39ae76d9113ee9b785a2 files/digest-man-1.5o_p1 61
 MD5 7e4bd368680d1c95bdaa6c6d5ee556f1 files/man-1.5m-locale-order.patch 454
 MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
 MD5 9feb57fe5fbc4c123a42c7cf0314e628 files/digest-man-1.5m-r2 61
 MD5 aefc4e52d394932d7b55a5475e9284b8 files/man-1.5m-cross-compile.patch 296
+MD5 43a67f127cf7051e3399773c5e8d56f6 files/man-1.5o_p1-man2html-CFLAGS.patch 343
 MD5 963a9363ab4bdb32e5fccaf0edc48d19 files/man-1.5m-LL-linelength.patch 475
 MD5 fc750a4d956da7cb889e89722fe8f4e2 files/man-1.5m-defmanpath-symlinks.patch 750
 MD5 3fd69820a5978ad926d9f3583b485e1a files/man-1.5m-groff-1.18.patch 689
 MD5 7de4684156992ffd479e773a4abc79d7 files/man-1.5m-locale-debug-info.patch 2128
 MD5 2a6b1a91ea6e3e46866a2a2f02ca9c70 files/man-1.5m-redhat-patches.patch 6782
 MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5m-search-order.patch 489
-MD5 cb6f4195874e0c7bd39bc6ccc26611b7 files/man-1.5m-security.patch 781
+MD5 4169bba88b07f0a81c8e5598e1d8c758 files/man-1.5m-security.patch 833
 MD5 fe9f5db8b8b6feaaac25563cb294c901 files/man-1.5m-util_c-segfault.patch 2276
 MD5 de02d99d60fb0e923c37e9130989b324 files/man-1.5m-wrong-quotes-v2.patch 328
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBvfNBroRuSHgZdywRAhjQAJ4i95A1KQfTs7hTJnnVq6Jf8B13QgCfWxhL
-741TS/BhezIKV80+PoKN1GY=
-=/reY
+iD8DBQFBvfstroRuSHgZdywRAmJEAJ9MydRCimMHZ1sxG4T4GdZv2+/gQgCbBcTX
+4z3x+u1TokjWgHHXOZX97hw=
+=PvTV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/digest-man-1.5o_p1 b/sys-apps/man/files/digest-man-1.5o_p1
new file mode 100644
index 000000000000..2ba0fbbab59b
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.5o_p1
@@ -0,0 +1 @@
+MD5 ff60906ee864be0fbf96cb023d113104 man-1.5o1.tar.gz 228844
diff --git a/sys-apps/man/files/man-1.5m-security.patch b/sys-apps/man/files/man-1.5m-security.patch
index 2f7e9e3db64b..f9918ed11c4b 100644
--- a/sys-apps/man/files/man-1.5m-security.patch
+++ b/sys-apps/man/files/man-1.5m-security.patch
@@ -1,12 +1,14 @@
 diff -urP man-1.5l/src/gripes.c man-1.5l/src/gripes.c
 --- man-1.5l/src/gripes.c Wed Jul 17 20:17:23 2002
 +++ man-1.5l/src/gripes.c Fri Jun  6 14:51:21 2003
-@@ -28,0 +28,1 @@
+@@ -28,1 +28,2 @@
 +#include <string.h>
-@@ -68,0 +68,2 @@
+ #include <nl_types.h>
+@@ -68,1 +68,3 @@
+     char *s;
 +    unsigned int i = 0;
 +    unsigned short fmt_n = 0;
-@@ -78,0 +78,13 @@
+@@ -78,1 +78,14 @@
 +    /* routine to filter format string abuse.  will */
 +    /* only allow %d, %s, and %o through.  no more  */
 +    /* than two formats needed for any response.    */
@@ -20,3 +22,4 @@ diff -urP man-1.5l/src/gripes.c man-1.5l/src/gripes.c
 +        if (fmt_n > 2) /* failed, default reply. */
 +            s = msg[n];
 +    }
+     return s;
diff --git a/sys-apps/man/files/man-1.5o_p1-man2html-CFLAGS.patch b/sys-apps/man/files/man-1.5o_p1-man2html-CFLAGS.patch
new file mode 100644
index 000000000000..87554454e83b
--- /dev/null
+++ b/sys-apps/man/files/man-1.5o_p1-man2html-CFLAGS.patch
@@ -0,0 +1,7 @@
+--- man-1.5o1/man2html/Makefile.in.orig	2004-12-13 15:02:05.204559672 -0500
++++ man-1.5o1/man2html/Makefile.in	2004-12-13 15:02:12.591436696 -0500
+@@ -1,3 +1,3 @@
+ CC = @CC@
+-CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -O
++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
diff --git a/sys-apps/man/man-1.5o_p1.ebuild b/sys-apps/man/man-1.5o_p1.ebuild
new file mode 100644
index 000000000000..bcf61bcb76a3
--- /dev/null
+++ b/sys-apps/man/man-1.5o_p1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5o_p1.ebuild,v 1.1 2004/12/13 20:26:58 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+NV="${PV/_p}"
+DESCRIPTION="Standard commands to read man pages"
+HOMEPAGE="http://freshmeat.net/projects/man/"
+SRC_URI="mirror://kernel/linux/utils/man/man-${NV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4"
+RDEPEND="sys-apps/cronbase
+	>=sys-apps/groff-1.18
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${NV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e 's:/usr/lib/locale:$(prefix)/usr/lib/locale:g' \
+		-e 's!/usr/bin:/usr/ucb:!/usr/bin:!' \
+		configure || die "configure sed failed"
+
+	# Make sure man2html respects our CFLAGS
+	epatch ${FILESDIR}/${P}-man2html-CFLAGS.patch
+
+	# security fix
+	epatch ${FILESDIR}/man-1.5m-security.patch
+
+	# Fix search order in man.conf so that system installed manpages
+	# will be found first ...
+	epatch ${FILESDIR}/man-1.5m-search-order.patch
+
+	# For groff-1.18 or later we need to call nroff with '-c'
+	epatch ${FILESDIR}/man-1.5m-groff-1.18.patch
+
+	# Fix a crash when calling man with:  man -k "foo bar" (bug #9761).
+	# <azarah@gentoo.org> (26 Dec 2002).
+	epatch ${FILESDIR}/man-1.5m-util_c-segfault.patch
+
+	# Various fixes from Redhat
+	epatch ${FILESDIR}/man-1.5m-redhat-patches.patch
+
+	# Do not print the 'man: No such file or directory' error if
+	# 'man -d' was called and the NLS catalogue was not found, as
+	# it confuses people, and be more informative  ... (bug #6360)
+	# <azarah@gentoo.org> (26 Dec 2002).
+	epatch ${FILESDIR}/man-1.5m-locale-debug-info.patch
+
+	# Line length overidden by nroff macros, thanks to 
+	# <grant.mcdorman@sympatico.ca> for the patch, (bug #21018). 
+	# 	-taviso@gentoo.org
+	epatch ${FILESDIR}/man-1.5m-LL-linelength.patch
+
+	# makewhatis traverses manpages twice, as default manpath
+	# contains two directories that are symlinked together
+	# (bug 23848)
+	#  -taviso@gentoo.org
+	epatch ${FILESDIR}/man-1.5m-defmanpath-symlinks.patch
+
+	# Make sure the locale is searched in the right order #37778
+	epatch ${FILESDIR}/man-1.5m-locale-order.patch
+
+	# Fix cross compiling ... a few build apps need to be compiled 
+	# with the native gcc instead of target gcc
+	epatch ${FILESDIR}/man-1.5m-cross-compile.patch
+
+	# use non-lazy binds for man. And let portage handling stripping.
+	append-ldflags -Wl,-z,now
+	sed -i \
+		-e "/^LDFLAGS = -s/s:=.*:=${LDFLAGS}:" \
+		${S}/src/Makefile.in \
+		|| die "failed to edit default LDLFAGS"
+}
+
+src_compile() {
+	tc-export CC BUILD_CC
+
+	local myconf=
+	use nls && myconf="+lang all" || myconf="+lang none"
+	./configure \
+		-confdir=/etc \
+		+sgid +fhs \
+		${myconf} || die "configure failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/{bin,sbin}
+	make PREFIX="${D}" install || die "make install failed"
+	dosym man /usr/bin/manpath
+
+	insinto /etc
+	doins src/man.conf
+
+	dodoc LSM README* TODO
+
+	if use nls ; then
+		cd "${S}/msgs"
+		./inst.sh ?? "${D}"/usr/share/locale/%L/%N
+	fi
+
+	# Needed for makewhatis
+	keepdir /var/cache/man
+	exeinto /etc/cron.weekly
+	newexe "${FILESDIR}/makewhatis.cron" makewhatis
+
+	fowners root:man /usr/bin/man
+	fperms 2555 /usr/bin/man
+
+	diropts -m0775 -g man
+	for x in $(awk '
+		/^MANSECT/ {
+			split($2, sects, ":")
+			for (x in sects)
+				print "cat" sects[x]
+		}' ${D}/etc/man.conf)
+	do
+		keepdir /var/cache/man/${x}
+	done
+}
+
+pkg_postinst() {
+	einfo "Forcing sane permissions onto ${ROOT}/var/cache/man (Bug #40322)"
+	chown -R root:man "${ROOT}/var/cache/man"
+	chmod -R g+w "${ROOT}/var/cache/man"
+	[ -e "${ROOT}/var/cache/man/whatis" ] \
+		&& chown root:root "${ROOT}/var/cache/man/whatis"
+
+	echo
+
+	local files="`ls ${ROOT}/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null`"
+	if [ "${files/$'\n'}" != "${files}" ] ; then
+		ewarn "You have multiple makewhatis cron files installed."
+		ewarn "You might want to delete all but one of these:"
+		echo ${files}
+	fi
+}