-beep (1.2.2-25) unstable; urgency=low
+beep (1.3-1) unstable; urgency=low
+ * New Upstream release importing all our changes \o/
* Bump Standards-Version to 3.9.2.
* Add Vcs-* fields to control file.
* Relicensed Debian packaging under WTFPLv2.
+++ /dev/null
-Author: Gerfried Fuchs <rhonda@debian.at> vim:ft=diff:
-Description: Do not remove a file from the system on install
-
-Index: beep-1.2.2/Makefile
-===================================================================
---- beep-1.2.2.orig/Makefile
-+++ beep-1.2.2/Makefile
-@@ -15,5 +15,5 @@ beep : beep.c
-
- install :
- cp ${EXEC_NAME} ${INSTALL_DIR}
-- rm -f /usr/man/man1/beep.1.bz2
-+ # rm -f /usr/man/man1/beep.1.bz2
- cp ${MAN_FILE} ${MAN_DIR}
+++ /dev/null
-Author: Gerfried Fuchs <rhonda@debian.at> vim:ft=diff:
-Description: Add support for --verbose/--debug option (BTS #297791, #335027)
-
-Index: beep-1.2.2/beep.c
-===================================================================
---- beep-1.2.2.orig/beep.c
-+++ beep-1.2.2/beep.c
-@@ -83,6 +83,7 @@ typedef struct beep_parms_t {
- so that beep can be tucked appropriately into a text-
- processing pipe.
- */
-+ int verbose; /* verbose output? */
- struct beep_parms_t *next; /* in case -n/--new is used. */
- } beep_parms_t;
-
-@@ -110,7 +111,7 @@ void handle_signal(int signum) {
- /* print usage and exit */
- void usage_bail(const char *executable_name) {
- printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] "
-- "[-D delay] [-s] [-c]\n",
-+ "[-D delay] [-s] [-c] [--verbose | --debug]\n",
- executable_name);
- printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name);
- printf("%s [-h] [--help]\n", executable_name);
-@@ -131,6 +132,7 @@ void usage_bail(const char *executable_n
- * "-D <delay in ms>" (similar to -d, but delay after last repetition as well)
- * "-s" (beep after each line of input from stdin, echo line to stdout)
- * "-c" (beep after each char of input from stdin, echo char to stdout)
-+ * "--verbose/--debug"
- * "-h/--help"
- * "-v/-V/--version"
- * "-n/--new"
-@@ -141,9 +143,11 @@ void usage_bail(const char *executable_n
- void parse_command_line(int argc, char **argv, beep_parms_t *result) {
- int c;
-
-- struct option opt_list[4] = {{"help", 0, NULL, 'h'},
-+ struct option opt_list[6] = {{"help", 0, NULL, 'h'},
- {"version", 0, NULL, 'V'},
- {"new", 0, NULL, 'n'},
-+ {"verbose", 0, NULL, 'X'},
-+ {"debug", 0, NULL, 'X'},
- {0,0,0,0}};
- while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL))
- != EOF) {
-@@ -204,9 +208,13 @@ void parse_command_line(int argc, char *
- result->next->delay = DEFAULT_DELAY;
- result->next->end_delay = DEFAULT_END_DELAY;
- result->next->stdin_beep = DEFAULT_STDIN_BEEP;
-+ result->next->verbose = result->verbose;
- result->next->next = NULL;
- result = result->next; /* yes, I meant to do that. */
- break;
-+ case 'X' : /* --debug / --verbose */
-+ result->verbose = 1;
-+ break;
- case 'h' : /* notice that this is also --help */
- default :
- usage_bail(argv[0]);
-@@ -217,6 +225,11 @@ void parse_command_line(int argc, char *
- void play_beep(beep_parms_t parms) {
- int i; /* loop counter */
-
-+ if(parms.verbose == 1)
-+ fprintf(stderr, "[DEBUG] %d times %d ms beeps (%d delay between, "
-+ "%d delay after) @ %.2f Hz\n",
-+ parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
-+
- /* try to snag the console */
- if((console_fd = open("/dev/console", O_WRONLY)) == -1) {
- fprintf(stderr, "Could not open /dev/console for writing.\n");
-@@ -253,6 +266,7 @@ int main(int argc, char **argv) {
- parms->delay = DEFAULT_DELAY;
- parms->end_delay = DEFAULT_END_DELAY;
- parms->stdin_beep = DEFAULT_STDIN_BEEP;
-+ parms->verbose = 0;
- parms->next = NULL;
-
- signal(SIGINT, handle_signal);
+++ /dev/null
-Author: Gerfried Fuchs <rhonda@debian.at> vim:ft=diff:
-Description: Print warning on multiple -f values (BTS #270056)
-
-Index: beep-1.2.2/beep.c
-===================================================================
---- beep-1.2.2.orig/beep.c
-+++ beep-1.2.2/beep.c
-@@ -159,6 +159,9 @@ void parse_command_line(int argc, char *
- (argfreq <= 0))
- usage_bail(argv[0]);
- else
-+ if (result->freq != 0)
-+ fprintf(stderr, "WARNING: multiple -f values given, only last "
-+ "one is used.\n");
- result->freq = argfreq;
- break;
- case 'l' : /* length */
-@@ -201,8 +204,10 @@ void parse_command_line(int argc, char *
- exit(0);
- break;
- case 'n' : /* also --new - create another beep */
-+ if (result->freq == 0)
-+ result->freq = DEFAULT_FREQ;
- result->next = (beep_parms_t *)malloc(sizeof(beep_parms_t));
-- result->next->freq = DEFAULT_FREQ;
-+ result->next->freq = 0;
- result->next->length = DEFAULT_LENGTH;
- result->next->reps = DEFAULT_REPS;
- result->next->delay = DEFAULT_DELAY;
-@@ -220,6 +225,8 @@ void parse_command_line(int argc, char *
- usage_bail(argv[0]);
- }
- }
-+ if (result->freq == 0)
-+ result->freq = DEFAULT_FREQ;
- }
-
- void play_beep(beep_parms_t parms) {
-@@ -260,7 +267,7 @@ int main(int argc, char **argv) {
- char sin[4096], *ptr;
-
- beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t));
-- parms->freq = DEFAULT_FREQ;
-+ parms->freq = 0;
- parms->length = DEFAULT_LENGTH;
- parms->reps = DEFAULT_REPS;
- parms->delay = DEFAULT_DELAY;
+++ /dev/null
-Author: Benjamin Gilbert <bgilbert@backtick.net> vim:ft=diff:
-Description: Open tty0 instead of console (BTS #134015)
-
-Index: beep-1.2.2/beep.c
-===================================================================
---- beep-1.2.2.orig/beep.c
-+++ beep-1.2.2/beep.c
-@@ -238,8 +238,8 @@ void play_beep(beep_parms_t parms) {
- parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
-
- /* try to snag the console */
-- if((console_fd = open("/dev/console", O_WRONLY)) == -1) {
-- fprintf(stderr, "Could not open /dev/console for writing.\n");
-+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) {
-+ fprintf(stderr, "Could not open /dev/tty0 for writing.\n");
- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
- perror("open");
- exit(1);
+++ /dev/null
-Author: Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de> vim:ft=diff:
-Description: Also try /dev/vc/0, devfs support (BTS #148884)
-
-Index: beep-1.2.2/beep.c
-===================================================================
---- beep-1.2.2.orig/beep.c
-+++ beep-1.2.2/beep.c
-@@ -239,10 +239,12 @@ void play_beep(beep_parms_t parms) {
-
- /* try to snag the console */
- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) {
-- fprintf(stderr, "Could not open /dev/tty0 for writing.\n");
-- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-- perror("open");
-- exit(1);
-+ if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) {
-+ fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n");
-+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-+ perror("open");
-+ exit(1);
-+ }
- }
-
- /* Beep */
+++ /dev/null
-Author: Alessandro Zummo vim:ft=diff:
-Description: evdev and general device node support (BTS #350214)
-
-Index: beep-1.2.2/beep.c
-===================================================================
---- beep-1.2.2.orig/beep.c
-+++ beep-1.2.2/beep.c
-@@ -26,6 +26,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <linux/kd.h>
-+#include <linux/input.h>
-
- /* I don't know where this number comes from, I admit that freely. A
- wonderful human named Raine M. Ekman used it in a program that played
-@@ -87,18 +88,48 @@ typedef struct beep_parms_t {
- struct beep_parms_t *next; /* in case -n/--new is used. */
- } beep_parms_t;
-
-+enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV };
-+
- /* Momma taught me never to use globals, but we need something the signal
- handlers can get at.*/
- int console_fd = -1;
-+int console_type = BEEP_TYPE_CONSOLE;
-+char *console_device = NULL;
-+
-+
-+void do_beep(int freq) {
-+ if (console_type == BEEP_TYPE_CONSOLE) {
-+ if(ioctl(console_fd, KIOCSOUND, freq != 0
-+ ? (int)(CLOCK_TICK_RATE/freq)
-+ : freq) < 0) {
-+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-+ perror("ioctl");
-+ }
-+ } else {
-+ /* BEEP_TYPE_EVDEV */
-+ struct input_event e;
-+
-+ e.type = EV_SND;
-+ e.code = SND_TONE;
-+ e.value = freq;
-+
-+ write(console_fd, &e, sizeof(struct input_event));
-+ }
-+}
-+
-
- /* If we get interrupted, it would be nice to not leave the speaker beeping in
- perpetuity. */
- void handle_signal(int signum) {
-+
-+ if(console_device)
-+ free(console_device);
-+
- switch(signum) {
- case SIGINT:
- if(console_fd >= 0) {
- /* Kill the sound, quit gracefully */
-- ioctl(console_fd, KIOCSOUND, 0);
-+ do_beep(0);
- close(console_fd);
- exit(signum);
- } else {
-@@ -111,7 +142,7 @@ void handle_signal(int signum) {
- /* print usage and exit */
- void usage_bail(const char *executable_name) {
- printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] "
-- "[-D delay] [-s] [-c] [--verbose | --debug]\n",
-+ "[-D delay] [-s] [-c] [--verbose | --debug] [-e device]\n",
- executable_name);
- printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name);
- printf("%s [-h] [--help]\n", executable_name);
-@@ -143,13 +174,14 @@ void usage_bail(const char *executable_n
- void parse_command_line(int argc, char **argv, beep_parms_t *result) {
- int c;
-
-- struct option opt_list[6] = {{"help", 0, NULL, 'h'},
-+ struct option opt_list[7] = {{"help", 0, NULL, 'h'},
- {"version", 0, NULL, 'V'},
- {"new", 0, NULL, 'n'},
- {"verbose", 0, NULL, 'X'},
- {"debug", 0, NULL, 'X'},
-+ {"device", 1, NULL, 'e'},
- {0,0,0,0}};
-- while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL))
-+ while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL))
- != EOF) {
- int argval = -1; /* handle parsed numbers for various arguments */
- float argfreq = -1;
-@@ -220,6 +252,9 @@ void parse_command_line(int argc, char *
- case 'X' : /* --debug / --verbose */
- result->verbose = 1;
- break;
-+ case 'e' : /* also --device */
-+ console_device = strdup(optarg);
-+ break;
- case 'h' : /* notice that this is also --help */
- default :
- usage_bail(argv[0]);
-@@ -238,24 +273,31 @@ void play_beep(beep_parms_t parms) {
- parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
-
- /* try to snag the console */
-- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) {
-- if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) {
-- fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n");
-- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-- perror("open");
-- exit(1);
-- }
-+ if(console_device)
-+ console_fd = open(console_device, O_WRONLY);
-+ else
-+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-+ console_fd = open("/dev/vc/0", O_WRONLY);
-+
-+ if(console_fd == -1) {
-+ fprintf(stderr, "Could not open %s for writing\n",
-+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
-+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-+ perror("open");
-+ exit(1);
- }
-+
-+ if (ioctl(console_fd, EVIOCGSND(0)) != -1)
-+ console_type = BEEP_TYPE_EVDEV;
-+ else
-+ console_type = BEEP_TYPE_CONSOLE;
-
- /* Beep */
- for (i = 0; i < parms.reps; i++) { /* start beep */
-- if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) {
-- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-- perror("ioctl");
-- }
-+ do_beep(parms.freq);
- /* Look ma, I'm not ansi C compatible! */
- usleep(1000*parms.length); /* wait... */
-- ioctl(console_fd, KIOCSOUND, 0); /* stop beep */
-+ do_beep(0); /* stop beep */
- if(parms.end_delay || (i+1 < parms.reps))
- usleep(1000*parms.delay); /* wait... */
- } /* repeat. */
-@@ -318,5 +360,8 @@ int main(int argc, char **argv) {
- parms = next;
- }
-
-+ if(console_device)
-+ free(console_device);
-+
- return EXIT_SUCCESS;
- }
-01_makefile-fixup
-02_verbose-option
-03_multiple-freq
-04_serial-console-fix
-05_devfs-fix
-06_event-option
projects / pkg / beep.git / commitdiff