diff --git a/debian/patches/0002-Fix-FTBFS-on-kfreebsd-any.patch b/debian/patches/0002-Fix-FTBFS-on-kfreebsd-any.patch deleted file mode 100644 index 3fac68d..0000000 --- a/debian/patches/0002-Fix-FTBFS-on-kfreebsd-any.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Dmitry Bogatov -Date: Fri, 2 Aug 2019 09:51:17 +0000 -Subject: Fix FTBFS on kfreebsd-any - -Closes: #933638 -Thanks: Svante Signell ---- - src/sulogin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sulogin.c b/src/sulogin.c -index 4200f8e..bccd92a 100644 ---- a/src/sulogin.c -+++ b/src/sulogin.c -@@ -146,7 +146,7 @@ void tcinit(struct console *con) - cfsetispeed(tio, ispeed); - cfsetospeed(tio, ospeed); - --#ifndef __GNU__ -+#if !defined(__GNU__) && !defined(__FreeBSD_kernel__) - tio->c_line = 0; - #endif - tio->c_cc[VTIME] = 0; diff --git a/debian/patches/0003-Fix-formatting-of-bootlogd-8.patch b/debian/patches/0003-Fix-formatting-of-bootlogd-8.patch deleted file mode 100644 index 3258b7b..0000000 --- a/debian/patches/0003-Fix-formatting-of-bootlogd-8.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Dmitry Bogatov -Date: Thu, 22 Aug 2019 15:46:03 +0000 -Subject: Fix formatting of bootlogd(8) - -Closes: #934628 ---- - man/bootlogd.8 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/man/bootlogd.8 b/man/bootlogd.8 -index 4f90270..da9d013 100644 ---- a/man/bootlogd.8 -+++ b/man/bootlogd.8 -@@ -79,4 +79,6 @@ If that syntax is ever changed by the kernel, or a console type is used that - .SH AUTHOR - Miquel van Smoorenburg, miquels@cistron.nl - .SH "SEE ALSO" --.BR dmesg (8), fdatasync (3), readbootlog(1). -+.BR dmesg (8), -+.BR fdatasync (3), -+.BR readbootlog (1) diff --git a/debian/patches/0004-fix-manpage-typo.patch b/debian/patches/0004-fix-manpage-typo.patch deleted file mode 100644 index 5b7c1fe..0000000 --- a/debian/patches/0004-fix-manpage-typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Ubuntu Developers -Date: Sat, 14 May 2022 02:57:07 +0800 -Subject: fix-manpage-typo - -# DP: provided by lintian -# DP: provided by lintian ---- - man/fstab-decode.8 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/fstab-decode.8 b/man/fstab-decode.8 -index 8710541..c83ba6f 100644 ---- a/man/fstab-decode.8 -+++ b/man/fstab-decode.8 -@@ -35,8 +35,8 @@ The argument escaping uses the same rules as path escaping in - and \fB/proc/mtab\fR. - - In essence fstab-decode can be used anytime we want to pass multiple --parameters to a command as a list of command line argments. It turns output --like this: -+parameters to a command as a list of command line arguments. -+It turns output like this: - - .nf - /root diff --git a/debian/patches/0005-workaround-gcc-lintian.patch b/debian/patches/0005-workaround-gcc-lintian.patch deleted file mode 100644 index 06d39b4..0000000 --- a/debian/patches/0005-workaround-gcc-lintian.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Ubuntu Developers -Date: Sat, 14 May 2022 02:57:07 +0800 -Subject: workaround-gcc-lintian -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -# DP: lintian finds “characte” in the source and tags it as a -# DP: spelling mistake, but it’s an artefact of GCC inlining -# DP: the strcpy call below; unify the way how err is produced -# DP: and use a secure string function while at it -# DP: lintian finds “characte” in the source and tags it as a -# DP: spelling mistake, but it’s an artefact of GCC inlining -# DP: the strcpy call below; unify the way how err is produced -# DP: and use a secure string function while at it ---- - src/init.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/init.c b/src/init.c -index 767d1ce..e12f083 100644 ---- a/src/init.c -+++ b/src/init.c -@@ -1507,12 +1507,17 @@ void read_inittab(void) - if (!action || !*action) - strcpy(err, "missing action field"); - if (id && strlen(id) > sizeof(utproto.ut_id)) -- sprintf(err, "id field too long (max %d characters)", -- (int)sizeof(utproto.ut_id)); -+ snprintf(err, sizeof(err), -+ "%s field too long (max %d characters)", -+ "id", (int)sizeof(utproto.ut_id)); - if (rlevel && strlen(rlevel) > 11) -- strcpy(err, "rlevel field too long (max 11 characters)"); -+ snprintf(err, sizeof(err), -+ "%s field too long (max %d characters)", -+ "rlevel", 11); - if (process && strlen(process) > 127) -- strcpy(err, "process field too long (max 127 characters)"); -+ snprintf(err, sizeof(err), -+ "%s field too long (max %d characters)", -+ "process", 127); - if (action && strlen(action) > 32) - strcpy(err, "action field too long"); - if (err[0] != 0) { diff --git a/debian/patches/11_run_nologin.patch b/debian/patches/11_run_nologin.patch deleted file mode 100644 index b922b4e..0000000 --- a/debian/patches/11_run_nologin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Roger Leigh -Date: Fri, 2 Aug 2019 09:49:34 +0000 -Subject: Use /run/nologin instead of /etc/nologin - -Bug-Debian: http://bugs.debian.org/660862 ---- - man/shutdown.8 | 2 +- - src/paths.h | 2 +- - src/shutdown.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/man/shutdown.8 b/man/shutdown.8 -index 5d012ec..3d8ac0e 100644 ---- a/man/shutdown.8 -+++ b/man/shutdown.8 -@@ -145,7 +145,7 @@ Second, it can be in the format \fB+\fP\fIm\fP, in which \fIm\fP is the - number of minutes to wait. The word \fBnow\fP is an alias for \fB+0\fP. - .PP - If shutdown is called with a delay, it will create the advisory file --.I /etc/nologin -+.I /run/nologin - which causes programs such as \fIlogin(1)\fP to not allow new user - logins. This file is created five minutes before the shutdown sequence - starts. Shutdown removes this file if it is stopped before it -diff --git a/src/paths.h b/src/paths.h -index 05f9c1b..c9b82c1 100644 ---- a/src/paths.h -+++ b/src/paths.h -@@ -28,7 +28,7 @@ - #define SDALLOW "/etc/shutdown.allow" /* Users allowed to shutdown */ - #define INITTAB "/etc/inittab" /* Location of inittab */ - #define INIT "/sbin/init" /* Location of init itself. */ --#define NOLOGIN "/etc/nologin" /* Stop user logging in. */ -+#define NOLOGIN "/run/nologin" /* Stop user logging in. */ - #define FASTBOOT "/fastboot" /* Enable fast boot. */ - #define FORCEFSCK "/forcefsck" /* Force fsck on boot */ - #define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */ -diff --git a/src/shutdown.c b/src/shutdown.c -index b744a2c..6e08910 100644 ---- a/src/shutdown.c -+++ b/src/shutdown.c -@@ -253,7 +253,7 @@ void issue_warn(int mins) - } - - /* -- * Create the /etc/nologin file. -+ * Create the /run/nologin file. - */ - void donologin(int min) - { diff --git a/debian/patches/fix-glibc.patch b/debian/patches/fix-glibc.patch deleted file mode 100644 index 51e9343..0000000 --- a/debian/patches/fix-glibc.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Dimitri John Ledkov -Date: Sat, 14 May 2022 02:57:07 +0800 -Subject: Make mountpoint.c compile with new glibc. - ---- - src/mountpoint.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mountpoint.c b/src/mountpoint.c -index b24335e..5297db0 100644 ---- a/src/mountpoint.c -+++ b/src/mountpoint.c -@@ -23,6 +23,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include - #include - #include - #include diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 92069a2..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,6 +0,0 @@ -11_run_nologin.patch -fix-glibc.patch -0002-Fix-FTBFS-on-kfreebsd-any.patch -0003-Fix-formatting-of-bootlogd-8.patch -0004-fix-manpage-typo.patch -0005-workaround-gcc-lintian.patch diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)