Author: paszczus Date: Mon Mar 7 22:02:56 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.5p
---- Files affected:
SOURCES:
man-fhs.patch (1.5 -> 1.6) , man-fmntbug.patch (1.1 -> 1.2) ,
man-gencat.patch (1.1 -> 1.2) , man-man2html.patch (1.7 -> 1.8) ,
man-manpaths.patch (1.8 -> 1.9) , man-ro-usr.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/man-fhs.patch
diff -u SOURCES/man-fhs.patch:1.5 SOURCES/man-fhs.patch:1.6
--- SOURCES/man-fhs.patch:1.5 Tue Aug 3 22:42:51 2004
+++ SOURCES/man-fhs.patch Mon Mar 7 23:02:51 2005
@@ -1,22 +1,11 @@
-diff -Nur man-1.5k.orig/catopen/catopen.c man-1.5k/catopen/catopen.c
---- man-1.5k.orig/catopen/catopen.c Mon Mar 19 21:37:38 2001
-+++ man-1.5k/catopen/catopen.c Sun Oct 14 00:48:37 2001
-@@ -10,7 +10,7 @@
- extern char *my_malloc(int); /* in util.c */
-
- #ifndef DEFAULT_NLSPATH
--#define DEFAULT_NLSPATH "/usr/lib/locale/%N/%L"
-+#define DEFAULT_NLSPATH "/usr/share/locale/%N/%L"
- #endif
-
- static nl_catd my_catopenpath(char *name, char *path);
---- man-1.5n/man2html/Makefile.in.orig 2004-08-03 22:11:25.745522192 +0200
-+++ man-1.5n/man2html/Makefile.in 2004-08-03 22:23:56.003465648 +0200
+diff -ur man-1.5p/man2html/Makefile.in man-1.5p.new/man2html/Makefile.in
+--- man-1.5p/man2html/Makefile.in 2005-01-08 00:49:37.000000000 +0000
++++ man-1.5p.new/man2html/Makefile.in 2005-03-07 21:38:26.480729032 +0000
@@ -31,13 +31,13 @@
mkdir -p $(httpdir)/cgi-aux/man
install -m 755 scripts/cgi-bin/man/* $(httpdir)/cgi-bin/man
install -m 644 scripts/cgi-aux/man/* $(httpdir)/cgi-aux/man
-- install -d -m 775 $(vardir)/man2html
+- install -d -o $(cgiowner) -g $(cgigroup) -m 775 $(vardir)/man2html
+ install -d -m 775 $(vardir)/cache/man2html
# (aux was renamed to cgi-aux since aux causes problems under DOS)
@@ -28,9 +17,9 @@
# In order not to have to type a long command like
# netscape http://localhost/cgi-bin/man/man2html?section+topic
-diff -Nur man-1.5k.orig/man2html/scripts/cgi-bin/man/mansearch
man-1.5k/man2html/scripts/cgi-bin/man/mansearch
---- man-1.5k.orig/man2html/scripts/cgi-bin/man/mansearch Mon Mar 19
17:14:06 2001
-+++ man-1.5k/man2html/scripts/cgi-bin/man/mansearch Mon Oct 15 22:00:21 2001
+diff -ur man-1.5p/man2html/scripts/cgi-bin/man/mansearch
man-1.5p.new/man2html/scripts/cgi-bin/man/mansearch
+--- man-1.5p/man2html/scripts/cgi-bin/man/mansearch 2003-03-11
15:53:30.000000000 +0000
++++ man-1.5p.new/man2html/scripts/cgi-bin/man/mansearch 2005-03-07
21:39:11.761845256 +0000
@@ -62,7 +62,7 @@
sedcmd = ENVIRON["SED"];
truncate_at = 11; # Single page display match limit.
@@ -40,9 +29,9 @@
for (i = 1; i < ARGC; i++) {
string = string " " ARGV[i];
-diff -Nur man-1.5k.orig/man2html/scripts/cgi-bin/man/mansec
man-1.5k/man2html/scripts/cgi-bin/man/mansec
---- man-1.5k.orig/man2html/scripts/cgi-bin/man/mansec Sun Mar 1 13:25:40 1998
-+++ man-1.5k/man2html/scripts/cgi-bin/man/mansec Mon Oct 15 22:00:11 2001
+diff -ur man-1.5p/man2html/scripts/cgi-bin/man/mansec
man-1.5p.new/man2html/scripts/cgi-bin/man/mansec
+--- man-1.5p/man2html/scripts/cgi-bin/man/mansec 2004-08-23
00:17:40.000000000 +0000
++++ man-1.5p.new/man2html/scripts/cgi-bin/man/mansec 2005-03-07
21:39:33.692511288 +0000
@@ -40,7 +40,7 @@
cache_suffix = "h";
}
@@ -52,9 +41,9 @@
cache_file = "manindex" cache_suffix "-" section ".html";
cache = cache_dir "/" cache_file;
cache_tmp = cache "_" pid;
-diff -Nur man-1.5k.orig/man2html/scripts/cgi-bin/man/manwhatis
man-1.5k/man2html/scripts/cgi-bin/man/manwhatis
---- man-1.5k.orig/man2html/scripts/cgi-bin/man/manwhatis Sat Sep 12
18:14:05 1998
-+++ man-1.5k/man2html/scripts/cgi-bin/man/manwhatis Mon Oct 15 22:00:02 2001
+diff -ur man-1.5p/man2html/scripts/cgi-bin/man/manwhatis
man-1.5p.new/man2html/scripts/cgi-bin/man/manwhatis
+--- man-1.5p/man2html/scripts/cgi-bin/man/manwhatis 2003-03-11
15:53:29.000000000 +0000
++++ man-1.5p.new/man2html/scripts/cgi-bin/man/manwhatis 2005-03-07
21:39:47.450419768 +0000
@@ -39,7 +39,7 @@
cache_suffix = "h";
}
@@ -63,4 +52,3 @@
+ cache_dir = "/var/cache/man2html";
cache_file = "whatis" cache_suffix "-" section ".html";
cache = cache_dir "/" cache_file;
-
================================================================
Index: SOURCES/man-fmntbug.patch
diff -u SOURCES/man-fmntbug.patch:1.1 SOURCES/man-fmntbug.patch:1.2
--- SOURCES/man-fmntbug.patch:1.1 Sat Jun 7 23:55:16 2003
+++ SOURCES/man-fmntbug.patch Mon Mar 7 23:02:51 2005
@@ -1,26 +1,10 @@
---- man-1.5l/src/gripes.c.orig Thu Jul 18 02:17:23 2002
-+++ man-1.5l/src/gripes.c Sat Jun 7 23:53:00 2003
-@@ -26,6 +26,7 @@
-
- #else /* NONLS */
-
-+#include <string.h>
- #include <nl_types.h>
- #include "../catopen/catopen.c"
-
-@@ -66,6 +67,8 @@
- static char *
- getmsg (int n) {
- char *s;
-+ unsigned int i = 0;
-+ unsigned short fmt_n = 0;
-
- catinit ();
- if (catfd == (nl_catd) -1 || !*(s = catgets(catfd, 1, n, ""))) {
-@@ -76,6 +79,19 @@
- exit (1);
- }
+--- man-1.5p/src/gripes.c 2005-01-08 08:01:21.000000000 +0000
++++ man-1.5p.new/src/gripes.c 2005-03-07 21:55:54.522402480 +0000
+@@ -21,7 +21,20 @@
+ fprintf (stderr, "man: internal error - cannot find message %d\n", n);
+ exit (1);
}
+- return s;
+ /* routine to filter format string abuse. will */
+ /* only allow %d, %s, and %o through. no more */
+ /* than two formats needed for any response. */
@@ -31,9 +15,19 @@
+ else
+ fmt_n=3; /* anything else = <limit. */
+ }
-+ if (fmt_n > 2) /* failed, default reply. */
++ if (fmt_n > 2) /* failed, default reply. */
+ s = msg[n];
+ }
- return s;
++ return s;
}
+ #else /* NONLS */
+@@ -99,6 +112,8 @@
+ static char *
+ getmsg (int n) {
+ char *s = "";
++ unsigned int i = 0;
++ unsigned short fmt_n = 0;
+
+ catinit ();
+ if (catfd != (nl_catd) -1) {
================================================================
Index: SOURCES/man-gencat.patch
diff -u SOURCES/man-gencat.patch:1.1 SOURCES/man-gencat.patch:1.2
--- SOURCES/man-gencat.patch:1.1 Thu Feb 22 20:34:13 2001
+++ SOURCES/man-gencat.patch Mon Mar 7 23:02:51 2005
@@ -1,12 +1,10 @@
-*** man-1.5h1/gencat/genlib.c Tue Dec 2 22:23:30 1997
---- man-1.5h1-ja/gencat/genlib.c Tue Apr 18 19:02:08 2000
-***************
-*** 47,52 ****
---- 47,53 ----
- 01/14/91 4 nazgul Off by one on number specified entries
- */
-
-+ #undef _GNU_SOURCE
- #include <stdio.h>
- #ifdef SYSV
- #include <sys/types.h>
+--- man-1.5p/gencat/genlib.c 2003-03-11 15:53:34.000000000 +0000
++++ man-1.5p.new/gencat/genlib.c 2005-03-07 21:49:59.035444712 +0000
+@@ -47,6 +47,7 @@
+ 01/14/91 4 nazgul Off by one on number specified entries
+ */
+
++#undef _GNU_SOURCE
+ #include <stdio.h>
+ #ifdef SYSV
+ #include <sys/types.h>
================================================================
Index: SOURCES/man-man2html.patch
diff -u SOURCES/man-man2html.patch:1.7 SOURCES/man-man2html.patch:1.8
--- SOURCES/man-man2html.patch:1.7 Tue Aug 3 22:42:52 2004
+++ SOURCES/man-man2html.patch Mon Mar 7 23:02:51 2005
@@ -1,12 +1,5 @@
---- man-1.5n/man2html/Makefile.in.orig 2004-03-23 22:48:56.000000000 +0100
-+++ man-1.5n/man2html/Makefile.in 2004-08-03 22:11:11.282720872 +0200
-@@ -1,5 +1,5 @@
- CC = @CC@
--CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -O
-+CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes
- OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
- bindir = $(DESTDIR)$(PREFIX)/usr/bin
- mandir = $(DESTDIR)$(PREFIX)@mandir@
+--- man-1.5p/man2html/Makefile.in 2005-01-08 00:49:37.000000000 +0000
++++ man-1.5p.new/man2html/Makefile.in 2005-03-07 21:33:04.408691424 +0000
@@ -31,7 +31,7 @@
mkdir -p $(httpdir)/cgi-aux/man
install -m 755 scripts/cgi-bin/man/* $(httpdir)/cgi-bin/man
================================================================
Index: SOURCES/man-manpaths.patch
diff -u SOURCES/man-manpaths.patch:1.8 SOURCES/man-manpaths.patch:1.9
--- SOURCES/man-manpaths.patch:1.8 Tue Mar 11 22:15:53 2003
+++ SOURCES/man-manpaths.patch Mon Mar 7 23:02:51 2005
@@ -1,11 +1,12 @@
---- man-1.5l/src/makewhatis.sh.orig Mon Mar 10 21:14:51 2003
-+++ man-1.5l/src/makewhatis.sh Tue Mar 11 21:50:50 2003
+diff -ur man-1.5p/src/makewhatis.sh man-1.5p.new/src/makewhatis.sh
+--- man-1.5p/src/makewhatis.sh 2005-01-08 18:04:00.000000000 +0000
++++ man-1.5p.new/src/makewhatis.sh 2005-03-07 21:29:44.671056160 +0000
@@ -41,7 +41,7 @@
# and should be first.
# It is a bug to add /var/cache/man to DEFCATPATH.
dm=
--for d in /usr/man /usr/share/man
-+for d in /usr/share/man
+-for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
++for d in /usr/share/man /usr/X11R6/man /usr/local/man
do
if [ -d $d ]; then
if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
@@ -18,7 +19,7 @@
do
if [ -d $d ]; then
if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
-@@ -391,13 +391,7 @@
+@@ -393,13 +393,7 @@
cd $here
================================================================
Index: SOURCES/man-ro-usr.patch
diff -u SOURCES/man-ro-usr.patch:1.3 SOURCES/man-ro-usr.patch:1.4
--- SOURCES/man-ro-usr.patch:1.3 Sun Aug 10 13:50:50 2003
+++ SOURCES/man-ro-usr.patch Mon Mar 7 23:02:51 2005
@@ -1,7 +1,6 @@
-diff -Nur man-1.5i2.orig/src/makewhatis.sh man-1.5i2/src/makewhatis.sh
---- man-1.5i2.orig/src/makewhatis.sh Sun Oct 14 11:01:23 2001
-+++ man-1.5i2/src/makewhatis.sh Sun Oct 14 11:03:00 2001
-@@ -122,7 +122,7 @@
+--- man-1.5p/src/makewhatis.sh 2005-01-08 18:04:00.000000000 +0000
++++ man-1.5p.new/src/makewhatis.sh 2005-03-07 21:44:16.818469600 +0000
+@@ -156,7 +156,7 @@
eval path="\$$pages"path
for mandir in $path
do
@@ -10,16 +9,16 @@
done
done
fi
-@@ -136,7 +136,7 @@
+@@ -170,7 +170,7 @@
if [ x$verbose != x ]; then
- echo "about to enter $mandir" > /dev/tty
+ echo "about to enter $mandir" > /dev/stderr
fi
- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
+ if [ -s /var/cache/man/whatis -a $pages = man -a x$update = x ]; then
if [ x$verbose != x ]; then
- echo skipping $mandir - we did it already > /dev/tty
+ echo skipping $mandir - we did it already > /dev/stderr
fi
-@@ -350,13 +350,13 @@
+@@ -401,13 +401,13 @@
mandir1=$mandir
fi
@@ -29,8 +28,7 @@
- cat ${mandir1}/whatis >> $TMPFILE
+ cat /var/cache/man/whatis >> $TMPFILE
fi
-- sed '/^$/d' < $TMPFILE | sort | uniq > ${mandir1}/whatis
-+ sed '/^$/d' < $TMPFILE | sort | uniq > /var/cache/man/whatis
+ tr -s '\n' < $TMPFILE | sort -u > ${mandir1}/whatis
- chmod 644 ${mandir1}/whatis
+ chmod 644 /var/cache/man/whatis
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/man-fhs.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/man-fmntbug.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/man-gencat.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/man-man2html.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SOURCES/man-manpaths.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SOURCES/man-ro-usr.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
