From owner-man-jp@jp.FreeBSD.org Sat Jan 28 13:22:11 2006
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id k0S4MBv92912;
	Sat, 28 Jan 2006 13:22:11 +0900 (JST)
	(envelope-from owner-man-jp@jp.FreeBSD.org)
Received: from mail.asahi-net.or.jp (mail1.asahi-net.or.jp [202.224.39.197])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id k0S4MAN92905
	for <man-jp@jp.FreeBSD.org>; Sat, 28 Jan 2006 13:22:10 +0900 (JST)
	(envelope-from CQG00620@nifty.ne.jp)
Received: from asahi-net.jp (h204168.ppp.asahi-net.or.jp [61.114.204.168])
	by mail.asahi-net.or.jp (Postfix) with ESMTP
	id DB12422F71; Sat, 28 Jan 2006 13:22:09 +0900 (JST)
From: Watanabe Kazuhiro <CQG00620@nifty.ne.jp>
To: Jun Kuriyama <kuriyama@FreeBSD.org>
Cc: man-jp@jp.FreeBSD.org
In-Reply-To: <060125015142.M0101650@shimako.yamayuri.org>
References: <20060124122329.BE9B62660B@mail.asahi-net.or.jp>	<060125015142.M0101650@shimako.yamayuri.org>
User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.7
 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/20.7 (i386--freebsd) MULE/4.0
 (HANANOEN)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=ISO-2022-JP
Message-Id: <20060128042209.DB12422F71@mail.asahi-net.or.jp>
Reply-To: man-jp@jp.FreeBSD.org
Precedence: list
Date: Sat, 28 Jan 2006 13:21:47 +0900
X-Sequence: man-jp 7844
Subject: [man-jp 7844] [ports/japanese/man] [patch] Turn off the schg and setuid flags of the jman(1) command
Sender: owner-man-jp@jp.FreeBSD.org
X-Originator: CQG00620@nifty.ne.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+051217

$BEOJU0l42$H?=$7$^$9!#(B

ja-man-1.1j_5 $B$N(B package $B$r(B pkg_add(1) $B$G%$%s%9%H!<%k$9$k$H!":n6H%G%#(B
$B%l%/%H%j$K0lIt$N%U%!%$%k$,:o=|$5$l$:$K;D$C$?$^$^$K$J$j$^$9!#(B

| pisces# pkg_add ja-man-1.1j_5.tbz 
| rm: /var/tmp/instmp.asOWqW/bin/jman: Operation not permitted
| rm: /var/tmp/instmp.asOWqW/bin: Directory not empty
| rm: /var/tmp/instmp.asOWqW: Directory not empty
| pkg_add: couldn't remove temporary dir '/var/tmp/instmp.asOWqW'
| pisces# ls -lo /var/tmp/instmp.asOWqW/bin/jman
| -r-sr-xr-x  1 man  wheel  schg 33156 Nov 16 19:54 /var/tmp/instmp.asOWqW/bin/jman
| pisces# 

$B8+$F$NDL$j!"(Bjman $B%3%^%s%I$K(B schg $B%U%i%0$,@_Dj$5$l$F$$$k$?$a$K>C5n$G$-(B
$B$J$$$h$&$G$9!#(B

$B$3$N7o$K$D$$$F(B man-jp $B%a!<%j%s%0%j%9%H$KJs9p$7$?$H$3$m(B [1]$B!"$=$b$=$b%*(B
$B%j%8%J%k$N(B man $B%3%^%s%I(B (/usr/bin/man) $B$K$*$$$F!"%;%-%e%j%F%#>e$N@H<e(B
$B@-$r9MN8$7$?7k2L!"(B 5.0-RELEASE $B0J9_(B setuid $B5Z$S(B schg $B%U%i%0$,30$5$l$F(B
$B$$$k$N$G!"(Bjman $B$b$3$NJQ99$r<h$j9~$`$Y$-$G$O$J$$$+$H$$$&%U%)%m!<$rD:$-(B
$B$^$7$?(B [2]$B!#(B

[1] [man-jp 7816]
[2] [man-jp 7821] , $B5Z$S(B
http://www.freebsd.org/cgi/cvsweb.cgi/src/gnu/usr.bin/man/man/Makefile#rev1.33


$B$=$3$G(B package $B%$%s%9%H!<%k;~$N:n6H%U%!%$%k$NLdBj$H!"$3$N%;%-%e%j%F%#(B
$B>e$N@H<e@-$N(B 2 $BE@$r2r7h$9$k$Y$/%Q%C%A$r:n@.$7$?$N$G!"(B ports $B%9%1%k%H%s(B
$B$N99?7$r$*4j$$$G$-$J$$$G$7$g$&$+!#(B

5.4-RELEASE-p10 $B$H(B ports-current $B$K$F%$%s%9%H!<%k5Z$S<B9T%F%9%H$r9T$J(B
$B$$$^$7$?$,!"0U?^$7$?$h$&$K(B catman $B$N@8@.$,M^$($i$l$F$$$k$h$&$G$9!#(B
$B$^$?(B package $B$r:n@.$7$F(B pkg_add $B$7$F$_$^$7$?$,!":n6H%U%!%$%k$NLdBj$b5/(B
$B$-$^$;$s$G$7$?!#(B

diff -urN man.orig/Makefile man/Makefile
--- man.orig/Makefile	Sat Feb 22 16:48:46 2003
+++ man/Makefile	Thu Jan 26 13:15:05 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	man
 PORTVERSION=	1.1j
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
 		${MASTER_SITE_PORTS_JP}
diff -urN man.orig/files/patch-aa man/files/patch-aa
--- man.orig/files/patch-aa	Mon Jan 29 10:21:07 2001
+++ man/files/patch-aa	Fri Jan 27 22:06:05 2006
@@ -1,7 +1,14 @@
---- man/Makefile	Mon Jan 15 20:13:00 2001
-+++ man/Makefile	Wed Jan 24 11:58:56 2001
-@@ -17,7 +17,7 @@
- CFLAGS+= -I${LIBDESTDIR}
+--- man/Makefile.orig	Thu Jan 26 12:29:34 2006
++++ man/Makefile	Thu Jan 26 12:34:07 2006
+@@ -10,21 +10,18 @@
+ SRCS=	man.c manpath.c glob.c locale.c
+ MAN1=	jman.1
+ EMAN1=	jman.1.eng.gz
+-BINOWN= man
+-BINMODE=4555
+-INSTALLFLAGS+= -fschg
+ 
+ CFLAGS+= -g -I${LIBDESTDIR}
  DPADD=	${LIBMAN}
  LDADD=	${LIBMAN}
 -.if exists(/usr/lib/libxpg4.a)
@@ -9,3 +16,11 @@
  LDADD+= -L/usr/lib -lxpg4
  .endif
  
+ DPADD+=  ${MAN1} ${EMAN1}
+ 
+ CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
+-CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644
++CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DCATMODE=0644
+ CFLAGS+= -DLOCALE
+ CLEANFILES+=	${MAN1} ${EMAN1} ${EMAN1}${compext}
+ MANDEPEND+=	${MAN1}
diff -urN man.orig/pkg-plist man/pkg-plist
--- man.orig/pkg-plist	Mon May 29 15:45:01 2000
+++ man/pkg-plist	Fri Jan 27 22:14:39 2006
@@ -1,5 +1,4 @@
 bin/jmanpath
-@unexec chflags noschg %B/jman
 bin/jman
 bin/japropos
 bin/jwhatis

---
Watanabe Kazuhiro (CQG00620@nifty.ne.jp)
