From b1edd6eeb0d1eec24d6731b3dbd4787bffca16b0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 21:41:09 +0200 Subject: Adding debian version 6.7-1. Signed-off-by: Daniel Baumann --- debian/patches/0001-fclose.3.patch | 4 +--- debian/patches/0002-getpwent.3.patch | 10 ++++------ debian/patches/0003-getpwnam.3.patch | 6 ++---- debian/patches/0004-nl_langinfo.3.patch | 6 ++---- debian/patches/0005-console_codes.4.patch | 8 +++----- debian/patches/0006-dir_colors.5.patch | 8 +++----- debian/patches/0007-motd.5.patch | 17 +++++------------ debian/patches/0008-nsswitch.conf.5.patch | 4 +--- debian/patches/0009-resolv.conf.5.patch | 4 +--- debian/patches/0010-tzfile.5.patch | 4 +--- debian/patches/0011-man.7.patch | 20 -------------------- debian/patches/0013-rtnetlink.7.patch | 4 +--- .../patches/0014-set-proper-installation-path.patch | 16 +++++++--------- debian/patches/0015-fix-groff-warning.patch | 4 +--- debian/patches/series | 1 - 15 files changed, 32 insertions(+), 84 deletions(-) delete mode 100644 debian/patches/0011-man.7.patch (limited to 'debian/patches') diff --git a/debian/patches/0001-fclose.3.patch b/debian/patches/0001-fclose.3.patch index 8feaf5b..111eaa1 100644 --- a/debian/patches/0001-fclose.3.patch +++ b/debian/patches/0001-fclose.3.patch @@ -6,11 +6,9 @@ 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 @@ function flushes the stream pointed to by +@@ -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 50c3c83..17c205c 100644 --- a/debian/patches/0002-getpwent.3.patch +++ b/debian/patches/0002-getpwent.3.patch @@ -6,8 +6,6 @@ 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 @@ @@ -18,9 +16,9 @@ index c46af20..839c614 100644 +.\" Modified Mon May 27 21:37:47 1996 by Martin Schulze +.\" Modified Thu Dec 13 21:10:55 2001 by Martin Schulze .\" - .TH getpwent 3 2023-07-20 "Linux man-pages 6.05.01" + .TH getpwent 3 2023-10-31 "Linux man-pages 6.7" .SH NAME -@@ -79,6 +80,21 @@ struct passwd { +@@ -79,6 +80,21 @@ }; .EE .in @@ -39,10 +37,10 @@ index c46af20..839c614 100644 +may be empty, in which case the system will execute the default shell +.RB ( /bin/sh ) +for the user. - .PP + .P For more information about the fields of this structure, see .BR passwd (5). -@@ -188,4 +204,6 @@ POSIX.1-2001, SVr4, 4.3BSD. +@@ -188,4 +204,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 83b18cc..1cbe605 100644 --- a/debian/patches/0003-getpwnam.3.patch +++ b/debian/patches/0003-getpwnam.3.patch @@ -6,11 +6,9 @@ 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 @@ structure. +@@ -194,10 +194,18 @@ .TP .B ERANGE Insufficient buffer space supplied. @@ -29,7 +27,7 @@ index 3e6af83..ac7262b 100644 .SH ATTRIBUTES For an explanation of the terms used in this section, see .BR attributes (7). -@@ -348,4 +356,5 @@ main(int argc, char *argv[]) +@@ -347,4 +355,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 0eba6bf..716b320 100644 --- a/debian/patches/0004-nl_langinfo.3.patch +++ b/debian/patches/0004-nl_langinfo.3.patch @@ -6,16 +6,14 @@ 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 @@ which was previously created by +@@ -56,6 +56,8 @@ .BR newlocale (3). Individual and additional elements of the locale categories can be queried. +.BR setlocale (3) +needs to be executed with proper arguments before. - .PP + .P Examples for the locale elements that can be specified in \fIitem\fP using the constants defined in \fI\fP are: diff --git a/debian/patches/0005-console_codes.4.patch b/debian/patches/0005-console_codes.4.patch index 4e6afd0..9f71c73 100644 --- a/debian/patches/0005-console_codes.4.patch +++ b/debian/patches/0005-console_codes.4.patch @@ -6,8 +6,6 @@ Subject: console_codes.4 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 @@ @@ -16,9 +14,9 @@ index e2ac4e8..e67a1f3 100644 .\" 2006-05-27, Several corrections - Thomas E. Dickey +.\" Modified Thu Dec 13 23:23:41 2001 by Martin Schulze .\" - .TH console_codes 4 2023-02-05 "Linux man-pages 6.05.01" + .TH console_codes 4 2024-01-28 "Linux man-pages 6.7" .SH NAME -@@ -716,7 +717,9 @@ ESC m Memory unlock (per HP terminals). +@@ -717,7 +718,9 @@ 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. @@ -27,4 +25,4 @@ index e2ac4e8..e67a1f3 100644 + Has no visible effect in xterm. ESC \[ti] LS1R Invoke the G1 character set as GR. .TE - .PP + .P diff --git a/debian/patches/0006-dir_colors.5.patch b/debian/patches/0006-dir_colors.5.patch index cb4593b..1fb6b71 100644 --- a/debian/patches/0006-dir_colors.5.patch +++ b/debian/patches/0006-dir_colors.5.patch @@ -6,11 +6,9 @@ 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 -@@ -374,8 +374,16 @@ hash mark as the first character. +@@ -374,8 +374,16 @@ .TP .I /etc/DIR_COLORS System-wide configuration file. @@ -20,10 +18,10 @@ index ccee252..3084d40 100644 +and thus Debian.) .TP .I \[ti]/.dir_colors -++.\" Rejected upstream ++.\" Rejected upstream +(Slackware, SuSE and RedHat only; ignored by GNU +.BR dircolors (1) +and thus Debian.) Per-user configuration file. - .PP + .P This page describes the diff --git a/debian/patches/0007-motd.5.patch b/debian/patches/0007-motd.5.patch index 90a7dc6..e1e7ee4 100644 --- a/debian/patches/0007-motd.5.patch +++ b/debian/patches/0007-motd.5.patch @@ -6,34 +6,27 @@ Subject: motd.5 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 @@ motd \- message of the day +@@ -12,12 +12,20 @@ The contents of .I /etc/motd are displayed by +-.BR login (1) +.\" Patched in Debian, maybe other distribs +.BR pam_motd (8) +.\" End of patch +.\" .BR login (1) - .BR login (1) after a successful login but just before it executes the login shell. - .PP + .P The abbreviation "motd" stands for "message of the day", and this file has been traditionally used for exactly that (it requires much less disk space than mail to all users). -+.PP ++.P +On Debian GNU/Linux, dynamic content configured at +.I /etc/pam.d/login +is also displayed by -+.IR pam_exec . ++.I pam_exec .SH FILES .I /etc/motd -+.br -+.I /etc/pam.d/login .SH SEE ALSO - .BR login (1), - .BR issue (5) -+.BR pam_motd (8) diff --git a/debian/patches/0008-nsswitch.conf.5.patch b/debian/patches/0008-nsswitch.conf.5.patch index 4312e46..e0701af 100644 --- a/debian/patches/0008-nsswitch.conf.5.patch +++ b/debian/patches/0008-nsswitch.conf.5.patch @@ -6,11 +6,9 @@ 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 @@ Include the specified +@@ -274,6 +274,11 @@ .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 29097ea..8bf9d92 100644 --- a/debian/patches/0009-resolv.conf.5.patch +++ b/debian/patches/0009-resolv.conf.5.patch @@ -6,11 +6,9 @@ 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 -@@ -249,6 +249,8 @@ this option is deprecated; applications should use +@@ -249,6 +249,8 @@ .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 0b8acc3..895df4c 100644 --- a/debian/patches/0010-tzfile.5.patch +++ b/debian/patches/0010-tzfile.5.patch @@ -6,11 +6,9 @@ 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 -@@ -205,6 +205,22 @@ if either +@@ -210,6 +210,22 @@ .B tzh_timecnt is zero or the time argument is less than the first transition time recorded in the file. diff --git a/debian/patches/0011-man.7.patch b/debian/patches/0011-man.7.patch deleted file mode 100644 index ddc1474..0000000 --- a/debian/patches/0011-man.7.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: "Dr. Tobias Quathamer" -Date: Sat, 6 Feb 2016 01:27:54 +0100 -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 @@ is not implemented. - .BR lexgrog (1), - .BR man (1), - .BR man2html (1), -+.BR groff_mdoc (7), - .BR whatis (1), - .BR groff_man (7), - .BR groff_www (7), diff --git a/debian/patches/0013-rtnetlink.7.patch b/debian/patches/0013-rtnetlink.7.patch index 5815c1e..b9c5cd0 100644 --- a/debian/patches/0013-rtnetlink.7.patch +++ b/debian/patches/0013-rtnetlink.7.patch @@ -6,11 +6,9 @@ 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 -@@ -13,6 +13,7 @@ rtnetlink \- Linux routing socket +@@ -13,6 +13,7 @@ .SH SYNOPSIS .nf .B #include diff --git a/debian/patches/0014-set-proper-installation-path.patch b/debian/patches/0014-set-proper-installation-path.patch index 3baeb79..bfd2eed 100644 --- a/debian/patches/0014-set-proper-installation-path.patch +++ b/debian/patches/0014-set-proper-installation-path.patch @@ -7,16 +7,14 @@ Forwarded: not-needed share/mk/install/_.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -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 +--- a/share/mk/configure/directory_variables.mk ++++ b/share/mk/configure/directory_variables.mk +@@ -13,7 +13,7 @@ - DESTDIR := --prefix := /usr/local -+prefix := /usr - + DESTDIR := +-prefix := /usr/local ++prefix := /usr datarootdir := $(prefix)/share docdir := $(datarootdir)/doc + htmldir := $(docdir)/html/man diff --git a/debian/patches/0015-fix-groff-warning.patch b/debian/patches/0015-fix-groff-warning.patch index b446a05..c6f28ba 100644 --- a/debian/patches/0015-fix-groff-warning.patch +++ b/debian/patches/0015-fix-groff-warning.patch @@ -8,11 +8,9 @@ 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 -@@ -195,7 +195,7 @@ where the string between "\fI[=\fP" and "\fI=]\fP" is any collating +@@ -195,7 +195,7 @@ element from its equivalence class, as defined for the current locale. For example, "\fI[[=a=]]\fP" might be equivalent diff --git a/debian/patches/series b/debian/patches/series index 98d3eaa..6f58cf7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,7 +8,6 @@ 0008-nsswitch.conf.5.patch 0009-resolv.conf.5.patch 0010-tzfile.5.patch -0011-man.7.patch 0013-rtnetlink.7.patch 0014-set-proper-installation-path.patch 0015-fix-groff-warning.patch -- cgit v1.2.3