[Pkg-wmaker-commits] [wmppp.app] 59/120: debian/patches: Remove patches now applied upstream; update remaining patches for new release.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 27 12:04:35 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 201a49e31c00df06f586d54e209568fd484fcfff
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Mon Sep 15 20:15:37 2014 -0500
debian/patches: Remove patches now applied upstream; update remaining patches
for new release.
---
debian/patches/allow_isdn_devices.patch | 30 ------------
debian/patches/display_speed_in_k.patch | 40 ---------------
debian/patches/get_number_from_getmodemspeed.patch | 8 +--
debian/patches/hardcode_actions.patch | 6 +--
debian/patches/hardening_flags.patch | 28 -----------
debian/patches/rename_fixed_options.patch | 20 --------
debian/patches/series | 6 ---
debian/patches/stampfile_handling.patch | 57 ----------------------
debian/patches/use_rm_-f_for_make_clean.patch | 20 --------
9 files changed, 7 insertions(+), 208 deletions(-)
diff --git a/debian/patches/allow_isdn_devices.patch b/debian/patches/allow_isdn_devices.patch
deleted file mode 100644
index c8ca539..0000000
--- a/debian/patches/allow_isdn_devices.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 6bf4a90..0000000
--- a/debian/patches/display_speed_in_k.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
index cf0a2f5..d587401 100644
--- a/debian/patches/get_number_from_getmodemspeed.patch
+++ b/debian/patches/get_number_from_getmodemspeed.patch
@@ -4,15 +4,15 @@ Description: Get number from getmodemspeed.
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. Also commented out
+ Converted to quilt for version 1.3.0+20140915-1. Also commented out
declaration of p to avoid unused variable compiler warning.
Author: Marcelo E. Magallon <mmagallo at debian.org>
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-09-13
+Last-Update: 2014-09-15
--- a/wmppp/wmppp.c
+++ b/wmppp/wmppp.c
-@@ -778,7 +778,7 @@
+@@ -795,7 +795,7 @@
int linespeed, i, k;
FILE *fp;
@@ -21,7 +21,7 @@ Last-Update: 2014-09-13
char temp[128];
fp = popen(speed_action, "r");
-@@ -791,9 +791,12 @@
+@@ -808,9 +808,12 @@
pclose(fp);
diff --git a/debian/patches/hardcode_actions.patch b/debian/patches/hardcode_actions.patch
index 17749c5..99944b5 100644
--- a/debian/patches/hardcode_actions.patch
+++ b/debian/patches/hardcode_actions.patch
@@ -4,9 +4,9 @@ Description: Hardcode actions
Modified to work with Debian PPP scripts and Debian ip-{up,dow}.d
structure.
.
- Converted to quilt for version 1.3.0+20120605-1.
+ Converted to quilt for version 1.3.0+20140915-1.
Author: Marcelo E. Magallon <mmagallo at debian.org>
-Last-Update: 2014-09-12
+Last-Update: 2014-09-15
--- a/wmppp/wmppp.c
+++ b/wmppp/wmppp.c
@@ -22,5 +22,5 @@ Last-Update: 2014-09-12
-#define IFDOWN_ACTION (NULL)
+#define IFDOWN_ACTION "/usr/bin/poff -r"
- #define STAMP_FILE "/var/run/ppp0.pid"
+ #define STAMP_FILE_PRE "/var/run/wmppp."
diff --git a/debian/patches/hardening_flags.patch b/debian/patches/hardening_flags.patch
deleted file mode 100644
index 50ede92..0000000
--- a/debian/patches/hardening_flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Hardening flags.
- Compile with CPPFLAGS and LDFLAGS and append, rather than overwrite, CFLAGS
- to enable hardening.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-09-13
-
---- a/wmppp/Makefile
-+++ b/wmppp/Makefile
-@@ -1,16 +1,16 @@
- LIBDIR = -L/usr/X11R6/lib
- LIBS = -lXpm -lXext -lX11
--CFLAGS = -O2
-+CFLAGS += -O2
- OBJS = wmppp.o \
- ../wmgeneral/wmgeneral.o \
- ../wmgeneral/misc.o \
- ../wmgeneral/list.o
-
- .c.o:
-- cc -g -c $(CFLAGS) -Wall $< -o $*.o
-+ cc -g -c $(CPPFLAGS) $(CFLAGS) -Wall $< -o $*.o
-
- wmppp: $(OBJS)
-- cc -o wmppp $^ -lXext $(LIBDIR) $(LIBS)
-+ cc -o wmppp $(LDFLAGS) $^ -lXext $(LIBDIR) $(LIBS)
-
- all:: wmppp getmodemspeed
-
diff --git a/debian/patches/rename_fixed_options.patch b/debian/patches/rename_fixed_options.patch
deleted file mode 100644
index 0be894e..0000000
--- a/debian/patches/rename_fixed_options.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 8f385db..50058ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
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
-hardening_flags.patch
diff --git a/debian/patches/stampfile_handling.patch b/debian/patches/stampfile_handling.patch
deleted file mode 100644
index 4770a93..0000000
--- a/debian/patches/stampfile_handling.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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);
diff --git a/debian/patches/use_rm_-f_for_make_clean.patch b/debian/patches/use_rm_-f_for_make_clean.patch
deleted file mode 100644
index ae2e9a6..0000000
--- a/debian/patches/use_rm_-f_for_make_clean.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use rm -f for make clean
- This patch prevents make clean from failing when the source tree is already
- clean.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-08-16
-
---- a/wmppp/Makefile
-+++ b/wmppp/Makefile
-@@ -16,9 +16,9 @@
-
- clean::
- for i in $(OBJS) ; do \
-- rm $$i; \
-+ rm -f $$i; \
- done
-- rm wmppp getmodemspeed
-+ rm -f wmppp getmodemspeed
-
- install::
-
--
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