Round-trip patches with gbp-pq
Dmitry Bogatov
4 years ago
0 | Description: Fix segfault in checkpassword | |
1 | Implicit declaration of crypt() due missing include of <crypt.h> caused | |
2 | pointer value, returned by crypt() to be mangled and invalid memory | |
3 | accessed. | |
4 | Author: Dmitry Bogatov <KAction@debian.org> | |
0 | From: Dmitry Bogatov <KAction@debian.org> | |
1 | Date: Sun, 12 May 2019 05:32:28 +0000 | |
2 | Subject: Fix segfault in checkpassword | |
3 | ||
5 | 4 | Forwarded: not-needed |
6 | 5 | Last-Update: 2019-01-07 |
6 | ||
7 | Implicit declaration of crypt() due missing include of <crypt.h> caused | |
8 | pointer value, returned by crypt() to be mangled and invalid memory | |
9 | accessed. | |
10 | Last-Update: 2019-01-07 | |
7 | 11 | --- |
8 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
9 | Index: fgetty/checkpassword.c | |
10 | =================================================================== | |
11 | --- fgetty.orig/checkpassword.c | |
12 | +++ fgetty/checkpassword.c | |
12 | checkpassword.c | 4 ++++ | |
13 | 1 file changed, 4 insertions(+) | |
14 | ||
15 | diff --git a/checkpassword.c b/checkpassword.c | |
16 | index edb7ce0..3b19f9e 100644 | |
17 | --- a/checkpassword.c | |
18 | +++ b/checkpassword.c | |
13 | 19 | @@ -1,9 +1,13 @@ |
14 | 20 | +#define _DEFAULT_SOURCE |
15 | 21 | #define _XOPEN_SOURCE |
0 | From 200b7d217ee3ac54b376116e7d64ce0844ecbed9 Mon Sep 17 00:00:00 2001 | |
1 | 0 | From: Dmitry Bogatov <KAction@debian.org> |
2 | 1 | Date: Tue, 1 Jan 2019 22:52:18 +0000 |
3 | 2 | Subject: [PATCH] Fix #833116 |
0 | 0 | From: Dmitry Bogatov <KAction@gnu.org> |
1 | 1 | Date: Fri, 1 Sep 2017 04:11:07 +0300 |
2 | X-Dgit-Generated: 0.7-3 469cd532d910496ef04fcd682505ecf6983d8aa2 | |
3 | 2 | Subject: [PATCH] Disable binary stripping |
4 | 3 | |
4 | --- | |
5 | Makefile | 3 +-- | |
6 | 1 file changed, 1 insertion(+), 2 deletions(-) | |
5 | 7 | |
6 | --- | |
7 | ||
8 | --- fgetty-0.7.orig/Makefile | |
9 | +++ fgetty-0.7/Makefile | |
8 | diff --git a/Makefile b/Makefile | |
9 | index 730a176..97ebf76 100644 | |
10 | --- a/Makefile | |
11 | +++ b/Makefile | |
10 | 12 | @@ -7,13 +7,12 @@ all: fgetty login login2 checkpassword |
11 | 13 | DIET=diet -Os |
12 | 14 | #CROSS=arm-linux- |
0 | 0 | From: Dmitry Bogatov <KAction@gnu.org> |
1 | 1 | Date: Fri, 1 Sep 2017 04:11:07 +0300 |
2 | X-Dgit-Generated: 0.7-3 39087416da44ca4a27131d5d7ddb71343581b6c8 | |
3 | 2 | Subject: [PATCH] Fix manpage installation |
4 | 3 | |
5 | 4 | Install manpage under /usr/share/man, not /usr/man. It fixes lintian error. |
5 | --- | |
6 | Makefile | 4 ++-- | |
7 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
6 | 8 | |
7 | --- | |
8 | ||
9 | --- fgetty-0.7.orig/Makefile | |
10 | +++ fgetty-0.7/Makefile | |
9 | diff --git a/Makefile b/Makefile | |
10 | index 97ebf76..df32647 100644 | |
11 | --- a/Makefile | |
12 | +++ b/Makefile | |
11 | 13 | @@ -29,12 +29,12 @@ debug: fgetty.c fmt_ulong.o |
12 | 14 | gcc -g -o debug fgetty.c fmt_ulong.o -DDEBUG |
13 | 15 |
0 | 0 | From: Dmitry Bogatov <KAction@gnu.org> |
1 | 1 | Date: Fri, 1 Sep 2017 04:11:07 +0300 |
2 | X-Dgit-Generated: 0.7-3 0f54d42cfb603888b202aa4130fa94d139726f71 | |
3 | 2 | Subject: [PATCH] Install login binaries into private directory |
4 | 3 | |
5 | 4 | These binaries are never invoked directly and as such should not |
6 | 5 | pollute PATH. Also, this way they do not have to have manpage. |
6 | --- | |
7 | Makefile | 6 +++--- | |
8 | fgetty.c | 2 +- | |
9 | login.c | 2 +- | |
10 | 3 files changed, 5 insertions(+), 5 deletions(-) | |
7 | 11 | |
8 | --- | |
9 | ||
10 | Index: fgetty/Makefile | |
11 | =================================================================== | |
12 | --- fgetty.orig/Makefile | |
13 | +++ fgetty/Makefile | |
12 | diff --git a/Makefile b/Makefile | |
13 | index a1ae4ad..088f7be 100644 | |
14 | --- a/Makefile | |
15 | +++ b/Makefile | |
14 | 16 | @@ -29,9 +29,9 @@ debug: fgetty.c fmt_ulong.o |
15 | 17 | gcc -g -o debug fgetty.c fmt_ulong.o -DDEBUG |
16 | 18 | |
24 | 26 | install fgetty $(DESTDIR)/sbin |
25 | 27 | install checkpassword $(DESTDIR)/bin/checkpassword.login |
26 | 28 | install -m 644 fgetty.8 $(DESTDIR)/usr/share/man/man8/fgetty.8 |
27 | Index: fgetty/fgetty.c | |
28 | =================================================================== | |
29 | --- fgetty.orig/fgetty.c | |
30 | +++ fgetty/fgetty.c | |
29 | diff --git a/fgetty.c b/fgetty.c | |
30 | index c4a6241..2f82116 100644 | |
31 | --- a/fgetty.c | |
32 | +++ b/fgetty.c | |
31 | 33 | @@ -311,7 +311,7 @@ int main(int argc,char *argv[]) { |
32 | 34 | loginargv[2]=logname; |
33 | 35 | echo_off(); |
37 | 39 | #else |
38 | 40 | execve("/bin/login", loginargv, environ); |
39 | 41 | #endif |
40 | Index: fgetty/login.c | |
41 | =================================================================== | |
42 | --- fgetty.orig/login.c | |
43 | +++ fgetty/login.c | |
42 | diff --git a/login.c b/login.c | |
43 | index 8a46a76..0bd9b16 100644 | |
44 | --- a/login.c | |
45 | +++ b/login.c | |
44 | 46 | @@ -25,7 +25,7 @@ |
45 | 47 | |
46 | 48 | #define CHECKPASSWORD "/bin/checkpassword.login" |
0 | 0 | From: Dmitry Bogatov <KAction@gnu.org> |
1 | 1 | Date: Fri, 1 Sep 2017 04:11:07 +0300 |
2 | X-Dgit-Generated: 0.7-3 e9d67d805b5d6285d370eb63a073617bd727d9c7 | |
3 | 2 | Subject: [PATCH] Link checkpassword with gnu libc, not diet libc |
4 | 3 | |
5 | 4 | Unfortunately, crypt(3) from diet libc does not recognize $6$ prefix |
15 | 14 | checkpassword would catch it without my interaction. |
16 | 15 | |
17 | 16 | Unfortunately, this patch can't be forwarded, since upstream is not interested. |
17 | --- | |
18 | Makefile | 6 +++--- | |
19 | checkpassword.c | 2 ++ | |
20 | 2 files changed, 5 insertions(+), 3 deletions(-) | |
18 | 21 | |
19 | --- | |
20 | ||
21 | --- fgetty-0.7.orig/Makefile | |
22 | +++ fgetty-0.7/Makefile | |
22 | diff --git a/Makefile b/Makefile | |
23 | index df32647..a1ae4ad 100644 | |
24 | --- a/Makefile | |
25 | +++ b/Makefile | |
23 | 26 | @@ -7,7 +7,6 @@ all: fgetty login login2 checkpassword |
24 | 27 | DIET=diet -Os |
25 | 28 | #CROSS=arm-linux- |
45 | 48 | checkpassword-pam: checkpassword-pam.o checkpassword-pam2.o |
46 | 49 | $(CROSS)$(CC) -o $@ $^ -lmisc $(LDFLAGS) |
47 | 50 | |
48 | --- fgetty-0.7.orig/checkpassword.c | |
49 | +++ fgetty-0.7/checkpassword.c | |
51 | diff --git a/checkpassword.c b/checkpassword.c | |
52 | index b7bbe85..655668a 100644 | |
53 | --- a/checkpassword.c | |
54 | +++ b/checkpassword.c | |
50 | 55 | @@ -1,8 +1,10 @@ |
51 | 56 | +#define _XOPEN_SOURCE |
52 | 57 | #include <string.h> |
0 | 0 | From: Adrian Bunk <bunk@debian.org> |
1 | 1 | Date: Tue, 13 Feb 2018 06:22:21 +0300 |
2 | X-Dgit-Generated: 0.7-3 aa7ede475fa28329223c7c9060e99b134d333139 | |
3 | 2 | Subject: [PATCH] Use "extern inline" for __write2 |
4 | 3 | |
5 | 4 | This is required to ensure that an out-of-line |
6 | 5 | version of the function will be generated. |
6 | --- | |
7 | checkpassword.c | 2 +- | |
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
7 | 9 | |
8 | --- | |
9 | ||
10 | --- fgetty-0.7.orig/checkpassword.c | |
11 | +++ fgetty-0.7/checkpassword.c | |
10 | diff --git a/checkpassword.c b/checkpassword.c | |
11 | index 655668a..edb7ce0 100644 | |
12 | --- a/checkpassword.c | |
13 | +++ b/checkpassword.c | |
12 | 14 | @@ -8,7 +8,7 @@ |
13 | 15 | #ifdef __dietlibc__ |
14 | 16 | #include <write12.h> |