[Pkg-wmaker-commits] [wmppp.app] 19/120: debian/patches: Convert previous patches to quilt.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 27 12:04:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmppp.app.
commit 036d6a0e732effc537b4ee08a5cc030f41d65f4d
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Fri Sep 12 07:31:24 2014 -0500
debian/patches: Convert previous patches to quilt.
---
debian/patches/allow_isdn_devices.patch | 30 ++++++++++++
debian/patches/display_speed_in_k.patch | 40 +++++++++++++++
debian/patches/get_number_from_getmodemspeed.patch | 25 ++++++++++
debian/patches/hardcode_actions.patch | 26 ++++++++++
debian/patches/rename_fixed_options.patch | 20 ++++++++
debian/patches/series | 6 +++
debian/patches/stampfile_handling.patch | 57 ++++++++++++++++++++++
7 files changed, 204 insertions(+)
diff --git a/debian/patches/allow_isdn_devices.patch b/debian/patches/allow_isdn_devices.patch
new file mode 100644
index 0000000..c8ca539
--- /dev/null
+++ b/debian/patches/allow_isdn_devices.patch
@@ -0,0 +1,30 @@
+Description: Allow ISDN devices
+ Users of ISDN dialup lines (such as me) cannot use wmppp as shipped,
+ because it rejects to use any device except those beginning with `ppp'.
+ .
+ The patch attached solves this.
+ .
+ Originally appeared in version 1.3.0-5. Converted to quilt for version
+ 1.3.0+20120605-1.
+Author: Juan Cespedes <cespedes at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=97509
+Last-Update: 2014-09-11
+
+--- a/wmppp/wmppp.c
++++ b/wmppp/wmppp.c
+@@ -310,10 +310,15 @@
+ usage();
+ exit(1);
+ }
++ /* following removed to allow experiments with
++ * new devices, i.e. ippp
++ */
++#if 0
+ if (strncmp(argv[i+1], "ppp", 3)) {
+ usage();
+ exit(1);
+ }
++#endif
+ active_interface = argv[i+1];
+ i++;
+ break;
diff --git a/debian/patches/display_speed_in_k.patch b/debian/patches/display_speed_in_k.patch
new file mode 100644
index 0000000..6bf4a90
--- /dev/null
+++ b/debian/patches/display_speed_in_k.patch
@@ -0,0 +1,40 @@
+Description: Display speed in K when too high
+ When the download speed is too high, wmppp can't display it because it has
+ only 5 digit. The most significant digits are hidden !
+ .
+ This small patch display the speed in K when it is too high.
+ .
+ Originally appeared in version 1.3.0-8. Converted to quilt for version
+ 1.3.0+20120605-1.
+Author: jguiton <jguiton at free.fr>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328699
+Last-Update: 2014-09-11
+
+--- a/wmppp/wmppp.c
++++ b/wmppp/wmppp.c
+@@ -770,6 +770,11 @@
+ void PrintLittle(int i, int *k) {
+
+ switch (i) {
++ case -2:
++ *k -= 5;
++ /* Print the "k" letter */
++ copyXPMArea(11*5-5, 86, 4, 9, *k, 48);
++ break;
+ case -1:
+ *k -= 5;
+ copyXPMArea(13*5-5, 86, 4, 9, *k, 48);
+@@ -838,6 +843,13 @@
+
+ k = 30;
+
++ /* If speed is greater than 99999, display it in K */
++ if (speed > 99999 )
++ {
++ speed /= 1024 ;
++ PrintLittle(-2, &k) ;
++ }
++
+ do {
+ PrintLittle(speed % 10, &k);
+ speed /= 10;
diff --git a/debian/patches/get_number_from_getmodemspeed.patch b/debian/patches/get_number_from_getmodemspeed.patch
new file mode 100644
index 0000000..ad9a7d4
--- /dev/null
+++ b/debian/patches/get_number_from_getmodemspeed.patch
@@ -0,0 +1,25 @@
+Description: Get number from getmodemspeed.
+ From debian/changelog for version 1.3.0-1:
+ .
+ Patched wmppp/wmppp.c to expect a NUMBER from getmodemspeed, and not the
+ whole connect line.
+ .
+ Converted to quilt for version 1.3.0+20120605-1.
+Author: Marcelo E. Magallon <mmagallo at debian.org>
+Last-Update: 2014-09-11
+
+--- a/wmppp/wmppp.c
++++ b/wmppp/wmppp.c
+@@ -791,9 +791,12 @@
+
+ pclose(fp);
+
++#if 0
+ if ((p=strstr(temp, "CONNECT"))) {
+ linespeed = atoi(p + 8);
+ }
++#endif
++ linespeed = atoi(temp);
+
+ k = 30;
+
diff --git a/debian/patches/hardcode_actions.patch b/debian/patches/hardcode_actions.patch
new file mode 100644
index 0000000..17749c5
--- /dev/null
+++ b/debian/patches/hardcode_actions.patch
@@ -0,0 +1,26 @@
+Description: Hardcode actions
+ From debian/changelog for version 1.1-1:
+ .
+ Modified to work with Debian PPP scripts and Debian ip-{up,dow}.d
+ structure.
+ .
+ Converted to quilt for version 1.3.0+20120605-1.
+Author: Marcelo E. Magallon <mmagallo at debian.org>
+Last-Update: 2014-09-12
+
+--- a/wmppp/wmppp.c
++++ b/wmppp/wmppp.c
+@@ -187,10 +187,10 @@
+ /* Defines */
+ /***********/
+
+-#define START_ACTION (NULL)
+-#define STOP_ACTION (NULL)
++#define START_ACTION "/usr/bin/pon"
++#define STOP_ACTION "/usr/bin/poff"
+ #define SPEED_ACTION (NULL)
+-#define IFDOWN_ACTION (NULL)
++#define IFDOWN_ACTION "/usr/bin/poff -r"
+
+ #define STAMP_FILE "/var/run/ppp0.pid"
+
diff --git a/debian/patches/rename_fixed_options.patch b/debian/patches/rename_fixed_options.patch
new file mode 100644
index 0000000..0be894e
--- /dev/null
+++ b/debian/patches/rename_fixed_options.patch
@@ -0,0 +1,20 @@
+Description: Rename fixed options
+ Rename system wide fixed options configuration file for consistency.
+ .
+ Originally appeared in version 1.3.0-1 or earlier. (This is the earliest
+ version on snapshot.debian.org, and this patch isn't mentioned in the
+ changelog.) Converted to quilt for version 1.3.0+20120605-1.
+Author: Marcelo E. Magallon <mmagallo at debian.org>
+Last-Update: 2014-09-12
+
+--- a/wmppp/wmppp.c
++++ b/wmppp/wmppp.c
+@@ -415,7 +415,7 @@
+ strcat(temp, "/.wmppprc");
+ parse_rcfile(temp, wmppp_keys);
+
+- strcpy(temp, "/etc/wmppp.fixed");
++ strcpy(temp, "/etc/wmppprc.fixed");
+ parse_rcfile(temp, wmppp_keys);
+
+ /* Open the display */
diff --git a/debian/patches/series b/debian/patches/series
index abed634..08269b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,7 @@
+hardcode_actions.patch
+rename_fixed_options.patch
+get_number_from_getmodemspeed.patch
+allow_isdn_devices.patch
+stampfile_handling.patch
+display_speed_in_k.patch
use_rm_-f_for_make_clean.patch
diff --git a/debian/patches/stampfile_handling.patch b/debian/patches/stampfile_handling.patch
new file mode 100644
index 0000000..4770a93
--- /dev/null
+++ b/debian/patches/stampfile_handling.patch
@@ -0,0 +1,57 @@
+Description: Stampfile handling
+ This patch adds support for "stampfile" in config file, as described in
+ manual page.
+ .
+ Originally appeared in version 1.3.0-5. Converted to quilt for version
+ 1.3.0+20120605-1.
+Author: Juan Cespedes <cespedes at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=97509
+Last-Update: 2014-09-11
+
+--- a/wmppp/wmppp.c
++++ b/wmppp/wmppp.c
+@@ -192,7 +192,7 @@
+ #define SPEED_ACTION (NULL)
+ #define IFDOWN_ACTION "/usr/bin/poff -r"
+
+-#define STAMP_FILE "/var/run/ppp0.pid"
++#define STAMP_FILE_PRE "/var/run/wmppp."
+
+ /* Defines voor alle coordinate */
+
+@@ -362,6 +362,7 @@
+ char *stop_action = NULL;
+ char *speed_action = NULL;
+ char *ifdown_action = NULL;
++char *stamp_file = NULL;
+
+ void wmppp_routine(int argc, char **argv) {
+
+@@ -370,6 +371,7 @@
+ { "stop", &stop_action },
+ { "speed", &speed_action },
+ { "ifdown", &ifdown_action },
++ { "stampfile", &stamp_file },
+ { NULL, NULL }
+ };
+
+@@ -411,6 +413,10 @@
+ if (STOP_ACTION) stop_action = strdup(STOP_ACTION);
+ if (SPEED_ACTION) speed_action = strdup(SPEED_ACTION);
+ if (IFDOWN_ACTION) ifdown_action = strdup(IFDOWN_ACTION);
++ if (STAMP_FILE_PRE) {
++ sprintf (temp, "%s%s", STAMP_FILE_PRE, active_interface);
++ stamp_file = strdup (temp);
++ }
+
+ strcpy(temp, "/etc/wmppprc");
+ parse_rcfile(temp, wmppp_keys);
+@@ -483,7 +489,7 @@
+ if (!starttime) {
+ starttime = currenttime;
+
+- if (stat(STAMP_FILE, &st) == 0)
++ if (stat(stamp_file, &st) == 0)
+ starttime = st.st_mtime;
+
+ SetOnLED(LED_PPP_POWER);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmppp.app.git
More information about the Pkg-wmaker-commits
mailing list