I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.
diff -Nru falselogin-0.3/Makefile falselogin-0.3/Makefile
--- falselogin-0.3/Makefile 2024-04-07 17:18:36.000000000 +0000
+++ falselogin-0.3/Makefile 2006-08-24 04:23:17.000000000 +0000
@@ -6,7 +6,7 @@
all: falselogin
install: falselogin
- $(INS) -D -o root -g root -m 0755 falselogin
$(DESTDIR)/usr/bin/falselogin
+ $(INS) -D -o root -g root -m 0755 -s falselogin
$(DESTDIR)/usr/bin/falselogin
$(INS) -D -o root -g root -m 0644 falselogin.conf
$(DESTDIR)/etc/falselogin.conf
clean:
diff -Nru falselogin-0.3/debian/README.debian
falselogin-0.3/debian/README.debian
--- falselogin-0.3/debian/README.debian 2024-04-07 17:18:36.000000000 +0000
+++ falselogin-0.3/debian/README.debian 2024-04-07 17:07:14.000000000 +0000
@@ -1,6 +1,6 @@
falselogin for Debian
----------------------
-With falselogin you can deny the user to log in the system but gives him/her
some info.
+With falselogin you can deny the user to log in the system but give him/her
some info.
Tibor Koleszar <o...@debian.org>, Wed, 8 Sep 1999 18:19:05 +0200
diff -Nru falselogin-0.3/debian/changelog falselogin-0.3/debian/changelog
--- falselogin-0.3/debian/changelog 2024-04-07 17:18:36.000000000 +0000
+++ falselogin-0.3/debian/changelog 2024-04-07 17:07:14.000000000 +0000
@@ -1,3 +1,16 @@
+falselogin (0.3-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format 3.0. (Closes: #1043154)
+ * d/copyright: Convert to machine-readable format.
+ * README: Fix typo.
+
+ [ Helmut Grohne ]
+ * Non-maintainer upload.
+ * Fix FTCBFS: Let dh_auto_build pass cross tools to make. (Closes: #928065)
+
+ -- Bastian Germann <b...@debian.org> Sun, 07 Apr 2024 17:07:14 +0000
+
falselogin (0.3-4.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru falselogin-0.3/debian/copyright falselogin-0.3/debian/copyright
--- falselogin-0.3/debian/copyright 2024-04-07 17:18:36.000000000 +0000
+++ falselogin-0.3/debian/copyright 2024-04-07 17:07:14.000000000 +0000
@@ -1,23 +1,26 @@
-This package was debianized by Tibor Koleszar <o...@debian.org> on
-Wed, 8 Sep 1999 18:19:05 +0200.
-
-Tibor Koleszar is also the upstream author.
-
-Copyright (C) 1999-2001 Tibor Koleszar
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This package was debianized by Tibor Koleszar <o...@debian.org> on
+ Wed, 8 Sep 1999 18:19:05 +0200.
+Upstream-Contact:
+ Tibor Koleszar <o...@debian.org>
+
+Files: *
+Copyright: (C) 1999-2001 Tibor Koleszar
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Comment:
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru falselogin-0.3/debian/patches/debian.patch
falselogin-0.3/debian/patches/debian.patch
--- falselogin-0.3/debian/patches/debian.patch 1970-01-01 00:00:00.000000000
+0000
+++ falselogin-0.3/debian/patches/debian.patch 2024-04-07 17:07:14.000000000
+0000
@@ -0,0 +1,124 @@
+--- falselogin-0.3.orig/Makefile
++++ falselogin-0.3/Makefile
+@@ -6,7 +6,7 @@ INS = /usr/bin/install
+ all: falselogin
+
+ install: falselogin
+- $(INS) -D -o root -g root -m 0755 -s falselogin
$(DESTDIR)/usr/bin/falselogin
++ $(INS) -D -o root -g root -m 0755 falselogin
$(DESTDIR)/usr/bin/falselogin
+ $(INS) -D -o root -g root -m 0644 falselogin.conf
$(DESTDIR)/etc/falselogin.conf
+
+ clean:
+--- falselogin-0.3.orig/falselogin.c
++++ falselogin-0.3/falselogin.c
+@@ -37,7 +37,6 @@
+ #define MAIL_LEN 50
+
+ // Function definitions
+-int readArgs (char *argv[]);
+ int countMail (char userName[]);
+
+ int main (int argc, char *argv[]) {
+@@ -49,6 +48,7 @@ int main (int argc, char *argv[]) {
+ struct utsname u_name; // this holds the u_name
+ size_t max_buf = MAXLEN_BUF; // maximum buffer length
+ int ok = 0; // lame control (see
passwd filling)
++ long wait = 0; // seconds (negative to
wait for ENTER)
+
+ temp = malloc(MAXLEN_BUF); // initial allocation
(could happen later)
+ // thou shalt not cast
+@@ -58,7 +58,7 @@ int main (int argc, char *argv[]) {
+ // (it might be a better way)
+ while (!ok) {
+ pwd = getpwent ();
+- if (pwd->pw_uid == getuid ())
++ if (pwd && pwd->pw_uid == getuid ())
+ ok = 1;
+ }
+
+@@ -101,6 +101,16 @@ int main (int argc, char *argv[]) {
+ // buffer which is 1024 bytes long, so only 1023
+ // characters will be allowed.
+
++ // Search for a wait parameter
++
++ if ( !strncmp(temp, "wait=", 5) ) {
++ if ( !strncmp(temp+5, "enter", 5) )
++ wait = -1;
++ else if ( atol(temp+5) > 0 )
++ wait = atol(temp+5);
++ continue;
++ }
++
+ // Substitutions using passwd and uname structs
+
+ if (strstr (temp, "%user%") != NULL)
+@@ -158,7 +168,14 @@ int main (int argc, char *argv[]) {
+
+ // Now we can check the arguments
+ if (argc > 2) {
+- if (readArgs(argv) == 255) {
++ // Supersedes the eventual wait value in the conf file
++ if ( !strncmp(argv[1], "--wait", 6) || !strncmp(argv[1], "-w",
2) ) {
++ if ( !strncmp(argv[2], "enter", 5) )
++ wait = -1;
++ else if ( atol(argv[2]) > 0 )
++ wait = atol(argv[2]);
++ }
++ else {
+ printf("Unknown arguments were given\n");
+ }
+ }
+@@ -167,6 +184,13 @@ int main (int argc, char *argv[]) {
+ exit(EXIT_FAILURE);
+ }
+
++ // Wait for some time or the user to press ENTER.
++ // If no wait where specified it doesn't wait (0 sec).
++ if (wait >= 0)
++ sleep(wait);
++ else
++ while (getchar() != '\n');
++
+ // Bye-bye if we don't have arguments
+ exit(EXIT_SUCCESS);
+ }
+@@ -190,16 +214,3 @@ int countMail (char userName[MAXLEN_USER
+
+ return total;
+ }
+-
+-int readArgs (char *argv[]) {
+- if ( !strncmp(argv[1], "--wait", 6) || !strncmp(argv[1], "-w", 2) ) {
+- if ( !strncmp(argv[2], "enter", 5) )
+- while (getchar() != '\n');
+- else if ( atol(argv[2]) > 0 )
+- sleep(atol(argv[2]));
+- }
+- else {
+- return 255;
+- }
+- return 1;
+-}
+--- falselogin-0.3.orig/falselogin.conf
++++ falselogin-0.3/falselogin.conf
+@@ -1,11 +1,15 @@
+ # /etc/falselogin.conf
+-# This is the configuration file of /bin/falselogin
+-# See the man for details
++# This is the configuration file for falselogin
++# See the man page for details
+ #
+-Welcome at %host% (Debian %debian_version% %sysname% %release%)!
++# Uncomment this line if you would like to specify
++# a specific wait time without the --wait option:
++# wait=5
++
++Welcome to %host% (Debian %debian_version% %sysname% %release%)!
+
+ You have %mail% messages in your mailbox.
+
+-Sorry %user% but our server does not accept shell logins.
++Sorry %user% our server does not accept shell logins.
+ So long and thanks for all the fish.
+
diff -Nru falselogin-0.3/debian/patches/series
falselogin-0.3/debian/patches/series
--- falselogin-0.3/debian/patches/series 1970-01-01 00:00:00.000000000
+0000
+++ falselogin-0.3/debian/patches/series 2024-04-07 17:07:14.000000000
+0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru falselogin-0.3/debian/rules falselogin-0.3/debian/rules
--- falselogin-0.3/debian/rules 2024-04-07 17:18:36.000000000 +0000
+++ falselogin-0.3/debian/rules 2024-04-07 17:05:04.000000000 +0000
@@ -11,7 +11,7 @@
build-stamp:
dh_testdir
- $(MAKE) C_ARGS="$(C_ARGS)"
+ dh_auto_build -- C_ARGS="$(C_ARGS)"
touch build-stamp
diff -Nru falselogin-0.3/debian/source/format
falselogin-0.3/debian/source/format
--- falselogin-0.3/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ falselogin-0.3/debian/source/format 2024-04-07 17:07:14.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru falselogin-0.3/falselogin.c falselogin-0.3/falselogin.c
--- falselogin-0.3/falselogin.c 2024-04-07 17:18:36.000000000 +0000
+++ falselogin-0.3/falselogin.c 2006-08-24 04:23:17.000000000 +0000
@@ -37,6 +37,7 @@
#define MAIL_LEN 50
// Function definitions
+int readArgs (char *argv[]);
int countMail (char userName[]);
int main (int argc, char *argv[]) {
@@ -48,7 +49,6 @@
struct utsname u_name; // this holds the u_name
size_t max_buf = MAXLEN_BUF; // maximum buffer length
int ok = 0; // lame control (see
passwd filling)
- long wait = 0; // seconds (negative to
wait for ENTER)
temp = malloc(MAXLEN_BUF); // initial allocation
(could happen later)
// thou shalt not cast
@@ -58,7 +58,7 @@
// (it might be a better way)
while (!ok) {
pwd = getpwent ();
- if (pwd && pwd->pw_uid == getuid ())
+ if (pwd->pw_uid == getuid ())
ok = 1;
}
@@ -101,16 +101,6 @@
// buffer which is 1024 bytes long, so only 1023
// characters will be allowed.
- // Search for a wait parameter
-
- if ( !strncmp(temp, "wait=", 5) ) {
- if ( !strncmp(temp+5, "enter", 5) )
- wait = -1;
- else if ( atol(temp+5) > 0 )
- wait = atol(temp+5);
- continue;
- }
-
// Substitutions using passwd and uname structs
if (strstr (temp, "%user%") != NULL)
@@ -168,14 +158,7 @@
// Now we can check the arguments
if (argc > 2) {
- // Supersedes the eventual wait value in the conf file
- if ( !strncmp(argv[1], "--wait", 6) || !strncmp(argv[1], "-w",
2) ) {
- if ( !strncmp(argv[2], "enter", 5) )
- wait = -1;
- else if ( atol(argv[2]) > 0 )
- wait = atol(argv[2]);
- }
- else {
+ if (readArgs(argv) == 255) {
printf("Unknown arguments were given\n");
}
}
@@ -184,13 +167,6 @@
exit(EXIT_FAILURE);
}
- // Wait for some time or the user to press ENTER.
- // If no wait where specified it doesn't wait (0 sec).
- if (wait >= 0)
- sleep(wait);
- else
- while (getchar() != '\n');
-
// Bye-bye if we don't have arguments
exit(EXIT_SUCCESS);
}
@@ -214,3 +190,16 @@
return total;
}
+
+int readArgs (char *argv[]) {
+ if ( !strncmp(argv[1], "--wait", 6) || !strncmp(argv[1], "-w", 2) ) {
+ if ( !strncmp(argv[2], "enter", 5) )
+ while (getchar() != '\n');
+ else if ( atol(argv[2]) > 0 )
+ sleep(atol(argv[2]));
+ }
+ else {
+ return 255;
+ }
+ return 1;
+}
diff -Nru falselogin-0.3/falselogin.conf falselogin-0.3/falselogin.conf
--- falselogin-0.3/falselogin.conf 2024-04-07 17:18:36.000000000 +0000
+++ falselogin-0.3/falselogin.conf 2006-08-24 04:23:17.000000000 +0000
@@ -1,15 +1,11 @@
# /etc/falselogin.conf
-# This is the configuration file for falselogin
-# See the man page for details
+# This is the configuration file of /bin/falselogin
+# See the man for details
#
-# Uncomment this line if you would like to specify
-# a specific wait time without the --wait option:
-# wait=5
-
-Welcome to %host% (Debian %debian_version% %sysname% %release%)!
+Welcome at %host% (Debian %debian_version% %sysname% %release%)!
You have %mail% messages in your mailbox.
-Sorry %user% our server does not accept shell logins.
+Sorry %user% but our server does not accept shell logins.
So long and thanks for all the fish.
