1 |
commit: 908e453722584ffd4fc12188903477c191be9a0f |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jun 26 06:49:36 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 27 20:49:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908e4537 |
7 |
|
8 |
app-misc/beep: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-2.3.101, Repoman-2.3.22 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/16426 |
13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
14 |
|
15 |
app-misc/beep/files/beep-1.3-CVE-2018-0492.patch | 106 ----------------------- |
16 |
app-misc/beep/files/beep-1.3-Makefile.patch | 26 ------ |
17 |
2 files changed, 132 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch b/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch |
20 |
deleted file mode 100644 |
21 |
index f4894b51fc8..00000000000 |
22 |
--- a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch |
23 |
+++ /dev/null |
24 |
@@ -1,106 +0,0 @@ |
25 |
-diff --git a/beep.c b/beep.c |
26 |
-index 7da2e70..4323d31 100644 |
27 |
---- beep.c |
28 |
-+++ beep.c |
29 |
-@@ -109,6 +109,7 @@ void do_beep(int freq) { |
30 |
- /* BEEP_TYPE_EVDEV */ |
31 |
- struct input_event e; |
32 |
- |
33 |
-+ memset(&e, 0, sizeof(e)); |
34 |
- e.type = EV_SND; |
35 |
- e.code = SND_TONE; |
36 |
- e.value = freq; |
37 |
-@@ -124,10 +125,6 @@ void do_beep(int freq) { |
38 |
- /* If we get interrupted, it would be nice to not leave the speaker beeping in |
39 |
- perpetuity. */ |
40 |
- void handle_signal(int signum) { |
41 |
-- |
42 |
-- if(console_device) |
43 |
-- free(console_device); |
44 |
-- |
45 |
- switch(signum) { |
46 |
- case SIGINT: |
47 |
- case SIGTERM: |
48 |
-@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { |
49 |
- result->verbose = 1; |
50 |
- break; |
51 |
- case 'e' : /* also --device */ |
52 |
-- console_device = strdup(optarg); |
53 |
-+ console_device = optarg; |
54 |
- break; |
55 |
- case 'h' : /* notice that this is also --help */ |
56 |
- default : |
57 |
-@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) { |
58 |
- "%d delay after) @ %.2f Hz\n", |
59 |
- parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); |
60 |
- |
61 |
-- /* try to snag the console */ |
62 |
-- if(console_device) |
63 |
-- console_fd = open(console_device, O_WRONLY); |
64 |
-- else |
65 |
-- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) |
66 |
-- console_fd = open("/dev/vc/0", O_WRONLY); |
67 |
-- |
68 |
-- if(console_fd == -1) { |
69 |
-- fprintf(stderr, "Could not open %s for writing\n", |
70 |
-- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); |
71 |
-- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ |
72 |
-- perror("open"); |
73 |
-- exit(1); |
74 |
-- } |
75 |
-- |
76 |
-- if (ioctl(console_fd, EVIOCGSND(0)) != -1) |
77 |
-- console_type = BEEP_TYPE_EVDEV; |
78 |
-- else |
79 |
-- console_type = BEEP_TYPE_CONSOLE; |
80 |
-- |
81 |
- /* Beep */ |
82 |
- for (i = 0; i < parms.reps; i++) { /* start beep */ |
83 |
- do_beep(parms.freq); |
84 |
-@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) { |
85 |
- if(parms.end_delay || (i+1 < parms.reps)) |
86 |
- usleep(1000*parms.delay); /* wait... */ |
87 |
- } /* repeat. */ |
88 |
-- |
89 |
-- close(console_fd); |
90 |
- } |
91 |
- |
92 |
- |
93 |
-@@ -328,6 +303,26 @@ int main(int argc, char **argv) { |
94 |
- signal(SIGTERM, handle_signal); |
95 |
- parse_command_line(argc, argv, parms); |
96 |
- |
97 |
-+ /* try to snag the console */ |
98 |
-+ if(console_device) |
99 |
-+ console_fd = open(console_device, O_WRONLY); |
100 |
-+ else |
101 |
-+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) |
102 |
-+ console_fd = open("/dev/vc/0", O_WRONLY); |
103 |
-+ |
104 |
-+ if(console_fd == -1) { |
105 |
-+ fprintf(stderr, "Could not open %s for writing\n", |
106 |
-+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); |
107 |
-+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ |
108 |
-+ perror("open"); |
109 |
-+ exit(1); |
110 |
-+ } |
111 |
-+ |
112 |
-+ if (ioctl(console_fd, EVIOCGSND(0)) != -1) |
113 |
-+ console_type = BEEP_TYPE_EVDEV; |
114 |
-+ else |
115 |
-+ console_type = BEEP_TYPE_CONSOLE; |
116 |
-+ |
117 |
- /* this outermost while loop handles the possibility that -n/--new has been |
118 |
- used, i.e. that we have multiple beeps specified. Each iteration will |
119 |
- play, then free() one parms instance. */ |
120 |
-@@ -365,8 +360,8 @@ int main(int argc, char **argv) { |
121 |
- parms = next; |
122 |
- } |
123 |
- |
124 |
-- if(console_device) |
125 |
-- free(console_device); |
126 |
-+ close(console_fd); |
127 |
-+ console_fd = -1; |
128 |
- |
129 |
- return EXIT_SUCCESS; |
130 |
- } |
131 |
|
132 |
diff --git a/app-misc/beep/files/beep-1.3-Makefile.patch b/app-misc/beep/files/beep-1.3-Makefile.patch |
133 |
deleted file mode 100644 |
134 |
index f4b891e8b82..00000000000 |
135 |
--- a/app-misc/beep/files/beep-1.3-Makefile.patch |
136 |
+++ /dev/null |
137 |
@@ -1,26 +0,0 @@ |
138 |
---- a/Makefile 2002-03-29 09:37:22.000000000 -0800 |
139 |
-+++ b/Makefile 2009-03-27 22:19:18.000000000 -0700 |
140 |
-@@ -1,17 +1,18 @@ |
141 |
--CC=gcc |
142 |
--FLAGS=-Wall |
143 |
-+CC ?= gcc |
144 |
-+LDFLAGS ?= |
145 |
-+CFLAGS ?= -Wall |
146 |
- EXEC_NAME=beep |
147 |
- INSTALL_DIR=/usr/bin |
148 |
- MAN_FILE=beep.1.gz |
149 |
--MAN_DIR=/usr/man/man1 |
150 |
-+MAN_DIR=/usr/share/man/man1 |
151 |
- |
152 |
- default : beep |
153 |
- |
154 |
- clean : |
155 |
-- rm ${EXEC_NAME} |
156 |
-+ rm -f ${EXEC_NAME} |
157 |
- |
158 |
- beep : beep.c |
159 |
-- ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c |
160 |
-+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${EXEC_NAME} beep.c |
161 |
- |
162 |
- install : |
163 |
- cp ${EXEC_NAME} ${INSTALL_DIR} |