summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Tobias Quathamer <toddy@debian.org>2023-09-11 21:23:55 +0200
committerDr. Tobias Quathamer <toddy@debian.org>2023-09-11 21:26:08 +0200
commit9ea44992b7f384621782b11b0fd535e9b2fd33d4 (patch)
tree01c01c8a6bf7f902ed1f7b6367247967eba78ab6
parent1b07dc794627e675c32c699263e23a597a0e60f0 (diff)
Refresh patches
-rw-r--r--debian/patches/0001-fclose.3.patch4
-rw-r--r--debian/patches/0002-getpwent.3.patch8
-rw-r--r--debian/patches/0003-getpwnam.3.patch6
-rw-r--r--debian/patches/0004-nl_langinfo.3.patch4
-rw-r--r--debian/patches/0005-console_codes.4.patch10
-rw-r--r--debian/patches/0006-dir_colors.5.patch4
-rw-r--r--debian/patches/0007-motd.5.patch8
-rw-r--r--debian/patches/0008-nsswitch.conf.5.patch4
-rw-r--r--debian/patches/0009-resolv.conf.5.patch4
-rw-r--r--debian/patches/0010-tzfile.5.patch6
-rw-r--r--debian/patches/0011-man.7.patch4
-rw-r--r--debian/patches/0013-rtnetlink.7.patch4
-rw-r--r--debian/patches/0014-set-proper-installation-path.patch17
-rw-r--r--debian/patches/0015-fix-groff-warning.patch16
14 files changed, 69 insertions, 30 deletions
diff --git a/debian/patches/0001-fclose.3.patch b/debian/patches/0001-fclose.3.patch
index 111eaa1d1..8feaf5b5a 100644
--- a/debian/patches/0001-fclose.3.patch
+++ b/debian/patches/0001-fclose.3.patch
@@ -6,9 +6,11 @@ Subject: fclose.3
man3/fclose.3 | 10 ++++++++++
1 file changed, 10 insertions(+)
+diff --git a/man3/fclose.3 b/man3/fclose.3
+index 3694d54..585b08f 100644
--- a/man3/fclose.3
+++ b/man3/fclose.3
-@@ -34,6 +34,16 @@
+@@ -34,6 +34,16 @@ function flushes the stream pointed to by
(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 a43dbaf75..50c3c831b 100644
--- a/debian/patches/0002-getpwent.3.patch
+++ b/debian/patches/0002-getpwent.3.patch
@@ -6,6 +6,8 @@ Subject: getpwent.3
man3/getpwent.3 | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
+diff --git a/man3/getpwent.3 b/man3/getpwent.3
+index c46af20..839c614 100644
--- a/man3/getpwent.3
+++ b/man3/getpwent.3
@@ -9,7 +9,8 @@
@@ -16,9 +18,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 2023-02-05 "Linux man-pages 6.03"
+ .TH getpwent 3 2023-07-20 "Linux man-pages 6.05.01"
.SH NAME
-@@ -79,6 +80,21 @@
+@@ -79,6 +80,21 @@ struct passwd {
};
.EE
.in
@@ -40,7 +42,7 @@ Subject: getpwent.3
.PP
For more information about the fields of this structure, see
.BR passwd (5).
-@@ -181,4 +197,6 @@
+@@ -188,4 +204,6 @@ POSIX.1-2001, SVr4, 4.3BSD.
.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 ac41dc7e6..83b18ccf9 100644
--- a/debian/patches/0003-getpwnam.3.patch
+++ b/debian/patches/0003-getpwnam.3.patch
@@ -6,9 +6,11 @@ Subject: getpwnam.3
man3/getpwnam.3 | 9 +++++++++
1 file changed, 9 insertions(+)
+diff --git a/man3/getpwnam.3 b/man3/getpwnam.3
+index 3e6af83..ac7262b 100644
--- a/man3/getpwnam.3
+++ b/man3/getpwnam.3
-@@ -194,10 +194,18 @@
+@@ -194,10 +194,18 @@ structure.
.TP
.B ERANGE
Insufficient buffer space supplied.
@@ -27,7 +29,7 @@ Subject: getpwnam.3
.SH ATTRIBUTES
For an explanation of the terms used in this section, see
.BR attributes (7).
-@@ -337,4 +345,5 @@
+@@ -348,4 +356,5 @@ main(int argc, char *argv[])
.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 67da7d213..0eba6bf2f 100644
--- a/debian/patches/0004-nl_langinfo.3.patch
+++ b/debian/patches/0004-nl_langinfo.3.patch
@@ -6,9 +6,11 @@ Subject: nl_langinfo.3
man3/nl_langinfo.3 | 2 ++
1 file changed, 2 insertions(+)
+diff --git a/man3/nl_langinfo.3 b/man3/nl_langinfo.3
+index 2726c29..0efe203 100644
--- a/man3/nl_langinfo.3
+++ b/man3/nl_langinfo.3
-@@ -56,6 +56,8 @@
+@@ -56,6 +56,8 @@ which was previously created by
.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 cacc416d0..4e6afd0e9 100644
--- a/debian/patches/0005-console_codes.4.patch
+++ b/debian/patches/0005-console_codes.4.patch
@@ -3,9 +3,11 @@ Date: Sat, 6 Feb 2016 01:22:07 +0100
Subject: console_codes.4
---
- man4/console_codes.4 | 4 ++++
- 1 file changed, 4 insertions(+)
+ man4/console_codes.4 | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/man4/console_codes.4 b/man4/console_codes.4
+index e2ac4e8..e67a1f3 100644
--- a/man4/console_codes.4
+++ b/man4/console_codes.4
@@ -14,6 +14,7 @@
@@ -14,9 +16,9 @@ Subject: console_codes.4
.\" 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 2023-02-05 "Linux man-pages 6.03"
+ .TH console_codes 4 2023-02-05 "Linux man-pages 6.05.01"
.SH NAME
-@@ -716,7 +717,9 @@
+@@ -716,7 +717,9 @@ ESC m Memory unlock (per HP terminals).
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 7640aa5c7..cb4593b7a 100644
--- a/debian/patches/0006-dir_colors.5.patch
+++ b/debian/patches/0006-dir_colors.5.patch
@@ -6,9 +6,11 @@ Subject: dir_colors.5
man5/dir_colors.5 | 8 ++++++++
1 file changed, 8 insertions(+)
+diff --git a/man5/dir_colors.5 b/man5/dir_colors.5
+index ccee252..3084d40 100644
--- a/man5/dir_colors.5
+++ b/man5/dir_colors.5
-@@ -381,8 +381,16 @@
+@@ -374,8 +374,16 @@ hash mark as the first character.
.TP
.I /etc/DIR_COLORS
System-wide configuration file.
diff --git a/debian/patches/0007-motd.5.patch b/debian/patches/0007-motd.5.patch
index 024d9266c..4d3075180 100644
--- a/debian/patches/0007-motd.5.patch
+++ b/debian/patches/0007-motd.5.patch
@@ -3,12 +3,14 @@ Date: Sat, 6 Feb 2016 01:22:57 +0100
Subject: motd.5
---
- man5/motd.5 | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
+ man5/motd.5 | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+diff --git a/man5/motd.5 b/man5/motd.5
+index b506c95..f4c4748 100644
--- a/man5/motd.5
+++ b/man5/motd.5
-@@ -12,14 +12,26 @@
+@@ -12,14 +12,26 @@ motd \- message of the day
The contents of
.I /etc/motd
are displayed by
diff --git a/debian/patches/0008-nsswitch.conf.5.patch b/debian/patches/0008-nsswitch.conf.5.patch
index e0701af1b..4312e4629 100644
--- a/debian/patches/0008-nsswitch.conf.5.patch
+++ b/debian/patches/0008-nsswitch.conf.5.patch
@@ -6,9 +6,11 @@ Subject: nsswitch.conf.5
man5/nsswitch.conf.5 | 5 +++++
1 file changed, 5 insertions(+)
+diff --git a/man5/nsswitch.conf.5 b/man5/nsswitch.conf.5
+index 49b288e..eb690ed 100644
--- a/man5/nsswitch.conf.5
+++ b/man5/nsswitch.conf.5
-@@ -274,6 +274,11 @@
+@@ -274,6 +274,11 @@ Include the specified
.I user
from the NIS passwd/shadow map.
.TP
diff --git a/debian/patches/0009-resolv.conf.5.patch b/debian/patches/0009-resolv.conf.5.patch
index 72abe62a8..45d35a7c2 100644
--- a/debian/patches/0009-resolv.conf.5.patch
+++ b/debian/patches/0009-resolv.conf.5.patch
@@ -6,9 +6,11 @@ Subject: resolv.conf.5
man5/resolv.conf.5 | 2 ++
1 file changed, 2 insertions(+)
+diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5
+index 1ea918d..a2677b2 100644
--- a/man5/resolv.conf.5
+++ b/man5/resolv.conf.5
-@@ -226,6 +226,8 @@
+@@ -249,6 +249,8 @@ this option is deprecated; applications should use
.BR getaddrinfo (3),
rather than
.BR gethostbyname (3).
diff --git a/debian/patches/0010-tzfile.5.patch b/debian/patches/0010-tzfile.5.patch
index f9f53ded3..ea327dde3 100644
--- a/debian/patches/0010-tzfile.5.patch
+++ b/debian/patches/0010-tzfile.5.patch
@@ -6,10 +6,12 @@ Subject: tzfile.5
man5/tzfile.5 | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
+diff --git a/man5/tzfile.5 b/man5/tzfile.5
+index 59d9f6b..8bd9e77 100644
--- a/man5/tzfile.5
+++ b/man5/tzfile.5
-@@ -184,6 +184,22 @@
- .I tzh_timecnt
+@@ -205,6 +205,22 @@ if either
+ .B tzh_timecnt
is zero or the time argument is less than the first transition time recorded
in the file.
+.\" http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=122906#47
diff --git a/debian/patches/0011-man.7.patch b/debian/patches/0011-man.7.patch
index 83d360bbc..ddc1474b0 100644
--- a/debian/patches/0011-man.7.patch
+++ b/debian/patches/0011-man.7.patch
@@ -6,9 +6,11 @@ Subject: man.7
man7/man.7 | 1 +
1 file changed, 1 insertion(+)
+diff --git a/man7/man.7 b/man7/man.7
+index b0788f3..62c9f56 100644
--- a/man7/man.7
+++ b/man7/man.7
-@@ -500,6 +500,7 @@
+@@ -500,6 +500,7 @@ is not implemented.
.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 1ce97cbc3..5815c1e5b 100644
--- a/debian/patches/0013-rtnetlink.7.patch
+++ b/debian/patches/0013-rtnetlink.7.patch
@@ -6,9 +6,11 @@ Subject: rtnetlink.7
man7/rtnetlink.7 | 1 +
1 file changed, 1 insertion(+)
+diff --git a/man7/rtnetlink.7 b/man7/rtnetlink.7
+index 3b6465f..f710bbe 100644
--- a/man7/rtnetlink.7
+++ b/man7/rtnetlink.7
-@@ -18,6 +18,7 @@
+@@ -13,6 +13,7 @@ rtnetlink \- Linux routing socket
.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 2fa62f8f1..3baeb79e9 100644
--- a/debian/patches/0014-set-proper-installation-path.patch
+++ b/debian/patches/0014-set-proper-installation-path.patch
@@ -1,10 +1,17 @@
-Description: change installation path in the Makefile.
-Author: Marcos Fouces <marcos@debian.org>.
+From: Marcos Fouces <marcos@debian.org>
+Date: Thu, 12 May 2022 00:06:17 +0200
+Subject: change installation path in the Makefile.
+
Forwarded: not-needed
+---
+ share/mk/install/_.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
---- a/lib/install.mk
-+++ b/lib/install.mk
-@@ -12,7 +12,7 @@
+diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
+index 751ab97..bbf4ee2 100644
+--- a/share/mk/install/_.mk
++++ b/share/mk/install/_.mk
+@@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/cmd.mk
DESTDIR :=
diff --git a/debian/patches/0015-fix-groff-warning.patch b/debian/patches/0015-fix-groff-warning.patch
index a5bda14d0..b446a05bd 100644
--- a/debian/patches/0015-fix-groff-warning.patch
+++ b/debian/patches/0015-fix-groff-warning.patch
@@ -1,10 +1,18 @@
-Description: marks the glyphs as defined in groff. This prevents the man
-viewer from issuing warnings about missing characters.
-Author: Marcos Fouces <marcos@debian.org>
+From: Marcos Fouces <marcos@debian.org>
+Date: Wed, 7 Sep 2022 00:27:23 +0200
+Subject: Mark the glyphs as defined in groff.
+This prevents the man viewer from issuing
+warnings about missing characters.
+---
+ man7/glob.7 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man7/glob.7 b/man7/glob.7
+index 466701c..c5c4577 100644
--- a/man7/glob.7
+++ b/man7/glob.7
-@@ -192,7 +192,7 @@
+@@ -195,7 +195,7 @@ where the string between "\fI[=\fP" and "\fI=]\fP" is any collating
element from its equivalence class, as defined for the
current locale.
For example, "\fI[[=a=]]\fP" might be equivalent