summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcos Fouces <marcos@debian.org>2022-12-28 18:08:26 +0100
committerMarcos Fouces <marcos@debian.org>2022-12-28 18:08:26 +0100
commitd0e35f01ecc505a76ee1794b70bfb1cd45763e56 (patch)
treebc8b48294e5b7c642f0d00ce2c2b6910c3e94ff9
parentc99b6cf5c1732818623d77ebb9f33136fcf7df83 (diff)
Refresh patches for new upstream release.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/0001-fclose.3.patch2
-rw-r--r--debian/patches/0002-getpwent.3.patch8
-rw-r--r--debian/patches/0003-getpwnam.3.patch4
-rw-r--r--debian/patches/0004-nl_langinfo.3.patch2
-rw-r--r--debian/patches/0005-console_codes.4.patch6
-rw-r--r--debian/patches/0006-dir_colors.5.patch2
-rw-r--r--debian/patches/0009-resolv.conf.5.patch2
-rw-r--r--debian/patches/0011-man.7.patch2
-rw-r--r--debian/patches/0013-rtnetlink.7.patch2
-rw-r--r--debian/patches/0014-set-proper-installation-path.patch2
11 files changed, 17 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index e1000e4a4..c55180fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ manpages (6.02-1) UNRELEASED; urgency=medium
[ Marcos Fouces ]
* New upstream version 6.02
+ * Refresh patches for new upstream release.
-- Marcos Fouces <marcos@debian.org> Wed, 28 Dec 2022 18:04:08 +0100
diff --git a/debian/patches/0001-fclose.3.patch b/debian/patches/0001-fclose.3.patch
index 3df221861..111eaa1d1 100644
--- a/debian/patches/0001-fclose.3.patch
+++ b/debian/patches/0001-fclose.3.patch
@@ -8,7 +8,7 @@ Subject: fclose.3
--- a/man3/fclose.3
+++ b/man3/fclose.3
-@@ -33,6 +33,16 @@
+@@ -34,6 +34,16 @@
(writing any buffered output data using
.BR fflush (3))
and closes the underlying file descriptor.
diff --git a/debian/patches/0002-getpwent.3.patch b/debian/patches/0002-getpwent.3.patch
index d4450f065..fa4232267 100644
--- a/debian/patches/0002-getpwent.3.patch
+++ b/debian/patches/0002-getpwent.3.patch
@@ -8,7 +8,7 @@ Subject: getpwent.3
--- a/man3/getpwent.3
+++ b/man3/getpwent.3
-@@ -8,7 +8,8 @@
+@@ -9,7 +9,8 @@
.\" 386BSD man pages
.\"
.\" Modified Sat Jul 24 19:22:14 1993 by Rik Faith (faith@cs.unc.edu)
@@ -16,9 +16,9 @@ Subject: getpwent.3
+.\" Modified Mon May 27 21:37:47 1996 by Martin Schulze <joey@linux.de>
+.\" Modified Thu Dec 13 21:10:55 2001 by Martin Schulze <joey@infodrom.org>
.\"
- .TH GETPWENT 3 2022-10-09 "Linux man-pages 6.01"
+ .TH getpwent 3 2022-12-15 "Linux man-pages 6.02"
.SH NAME
-@@ -78,6 +79,21 @@
+@@ -79,6 +80,21 @@
};
.EE
.in
@@ -40,7 +40,7 @@ Subject: getpwent.3
.PP
For more information about the fields of this structure, see
.BR passwd (5).
-@@ -180,4 +196,6 @@
+@@ -181,4 +197,6 @@
.BR getpwnam (3),
.BR getpwuid (3),
.BR putpwent (3),
diff --git a/debian/patches/0003-getpwnam.3.patch b/debian/patches/0003-getpwnam.3.patch
index e8b7da05f..ac41dc7e6 100644
--- a/debian/patches/0003-getpwnam.3.patch
+++ b/debian/patches/0003-getpwnam.3.patch
@@ -8,7 +8,7 @@ Subject: getpwnam.3
--- a/man3/getpwnam.3
+++ b/man3/getpwnam.3
-@@ -193,10 +193,18 @@
+@@ -194,10 +194,18 @@
.TP
.B ERANGE
Insufficient buffer space supplied.
@@ -27,7 +27,7 @@ Subject: getpwnam.3
.SH ATTRIBUTES
For an explanation of the terms used in this section, see
.BR attributes (7).
-@@ -336,4 +344,5 @@
+@@ -337,4 +345,5 @@
.BR getspnam (3),
.BR putpwent (3),
.BR setpwent (3),
diff --git a/debian/patches/0004-nl_langinfo.3.patch b/debian/patches/0004-nl_langinfo.3.patch
index 46bc1b38e..67da7d213 100644
--- a/debian/patches/0004-nl_langinfo.3.patch
+++ b/debian/patches/0004-nl_langinfo.3.patch
@@ -8,7 +8,7 @@ Subject: nl_langinfo.3
--- a/man3/nl_langinfo.3
+++ b/man3/nl_langinfo.3
-@@ -55,6 +55,8 @@
+@@ -56,6 +56,8 @@
.BR newlocale (3).
Individual and additional elements of the locale categories can
be queried.
diff --git a/debian/patches/0005-console_codes.4.patch b/debian/patches/0005-console_codes.4.patch
index 4b5742108..518f1e517 100644
--- a/debian/patches/0005-console_codes.4.patch
+++ b/debian/patches/0005-console_codes.4.patch
@@ -8,15 +8,15 @@ Subject: console_codes.4
--- a/man4/console_codes.4
+++ b/man4/console_codes.4
-@@ -13,6 +13,7 @@
+@@ -14,6 +14,7 @@
.\" Tiny correction, aeb, 961107.
.\"
.\" 2006-05-27, Several corrections - Thomas E. Dickey
+.\" Modified Thu Dec 13 23:23:41 2001 by Martin Schulze <joey@infodrom.org>
.\"
- .TH CONSOLE_CODES 4 2022-10-09 "Linux man-pages 6.01"
+ .TH console_codes 4 2022-12-15 "Linux man-pages 6.02"
.SH NAME
-@@ -715,8 +716,11 @@
+@@ -716,8 +717,11 @@
ESC n LS2 Invoke the G2 character set.
ESC o LS3 Invoke the G3 character set.
ESC | LS3R Invoke the G3 character set as GR.
diff --git a/debian/patches/0006-dir_colors.5.patch b/debian/patches/0006-dir_colors.5.patch
index a524ca000..041a4d8f8 100644
--- a/debian/patches/0006-dir_colors.5.patch
+++ b/debian/patches/0006-dir_colors.5.patch
@@ -8,7 +8,7 @@ Subject: dir_colors.5
--- a/man5/dir_colors.5
+++ b/man5/dir_colors.5
-@@ -379,9 +379,17 @@
+@@ -380,9 +380,17 @@
.SH FILES
.TP
.I /etc/DIR_COLORS
diff --git a/debian/patches/0009-resolv.conf.5.patch b/debian/patches/0009-resolv.conf.5.patch
index 100dcc99b..72abe62a8 100644
--- a/debian/patches/0009-resolv.conf.5.patch
+++ b/debian/patches/0009-resolv.conf.5.patch
@@ -15,5 +15,5 @@ Subject: resolv.conf.5
+
+Some programs behave strangely when this option is turned on.
.TP
- .BR ip6\-bytestring " (since glibc 2.3.4 to 2.24)"
+ .BR ip6\-bytestring " (since glibc 2.3.4 to glibc 2.24)"
Sets
diff --git a/debian/patches/0011-man.7.patch b/debian/patches/0011-man.7.patch
index 11b6fe659..83d360bbc 100644
--- a/debian/patches/0011-man.7.patch
+++ b/debian/patches/0011-man.7.patch
@@ -8,7 +8,7 @@ Subject: man.7
--- a/man7/man.7
+++ b/man7/man.7
-@@ -495,6 +495,7 @@
+@@ -500,6 +500,7 @@
.BR lexgrog (1),
.BR man (1),
.BR man2html (1),
diff --git a/debian/patches/0013-rtnetlink.7.patch b/debian/patches/0013-rtnetlink.7.patch
index 3801a8fdb..1ce97cbc3 100644
--- a/debian/patches/0013-rtnetlink.7.patch
+++ b/debian/patches/0013-rtnetlink.7.patch
@@ -8,7 +8,7 @@ Subject: rtnetlink.7
--- a/man7/rtnetlink.7
+++ b/man7/rtnetlink.7
-@@ -17,6 +17,7 @@
+@@ -18,6 +18,7 @@
.SH SYNOPSIS
.nf
.B #include <asm/types.h>
diff --git a/debian/patches/0014-set-proper-installation-path.patch b/debian/patches/0014-set-proper-installation-path.patch
index 726fc28d0..2fa62f8f1 100644
--- a/debian/patches/0014-set-proper-installation-path.patch
+++ b/debian/patches/0014-set-proper-installation-path.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/lib/install.mk
+++ b/lib/install.mk
-@@ -9,7 +9,7 @@
+@@ -12,7 +12,7 @@
DESTDIR :=