[Pkg-wmaker-commits] [wmifs] 33/118: Imported Debian patch 1.3b1-22

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmifs.

commit 22cd8877463dabaf8b184e45737cf811f5038e48
Author: Martin A. Godisch <godisch at debian.org>
Date:   Thu Jun 27 21:11:29 2013 +0200

    Imported Debian patch 1.3b1-22
---
 debian/changelog    | 16 ++++++++++++++++
 debian/control      |  2 +-
 debian/rules        | 16 +++++++++++++---
 wmifs/Makefile      |  4 ++--
 wmifs/wmifs-libc5.c |  4 ++--
 wmifs/wmifs.c       | 16 ++++++++++++++--
 6 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d02dec2..70eb16d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+wmifs (1.3b1-22) unstable; urgency=low
+
+  * Fixed segfault, thanks to The Mayhem Team from Cylab,
+    Carnegie Mellon University.
+  * Updated standards version:
+    + added build-arch, build-indep targets to debian/build,
+    + added hardening build flags.
+
+ -- Martin A. Godisch <godisch at debian.org>  Thu, 27 Jun 2013 21:11:29 +0200
+
+wmifs (1.3b1-21) unstable; urgency=low
+
+  * Now really fixed stats_ptr and ifr__name issue.
+
+ -- Martin A. Godisch <godisch at debian.org>  Wed, 25 Nov 2009 21:27:35 +0100
+
 wmifs (1.3b1-20) unstable; urgency=low
 
   * Replaced stats_ptr and ifr__name which are not defined on all archs.
diff --git a/debian/control b/debian/control
index da9da78..7c8fef2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Martin A. Godisch <godisch at debian.org>
 Build-Depends: libx11-dev, libxext-dev, libxpm-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
 
 Package: wmifs
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 93405b2..4d3aaab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,10 @@
 testdir  = test -f wmifs/wmifs.c && test -f debian/rules
 testroot = test x`whoami` = xroot
 
-CFLAGS = -Wall -g
+CPPFLAGS = -Wall $(shell dpkg-buildflags --get CPPFLAGS)
+export CPPFLAGS
+
+CFLAGS = -Wall -g $(shell dpkg-buildflags --get CFLAGS)
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -11,14 +14,21 @@ else
 endif
 export CFLAGS
 
+LDFLAGS = -Wall $(shell dpkg-buildflags --get LDFLAGS)
+export LDFLAGS
+
 clean:
 	$(testdir)
-	rm -f build debian/files debian/rejected debian/substvars
+	rm -f build build-arch build-indep debian/files debian/rejected debian/substvars
 	$(MAKE) -C wmifs clean
 	-cat `ls -r debian/patches/*.diff` /dev/null | patch -RENtp1 -r debian/rejected --no-backup-if-mismatch
 	rm -rf debian/tmp
 
-build:
+build: build-arch
+
+build-indep:
+
+build-arch:
 	$(testdir)
 	-cat debian/patches/*.diff | patch -Ntp1 -r debian/rejected --no-backup-if-mismatch
 	$(MAKE) -C wmifs
diff --git a/wmifs/Makefile b/wmifs/Makefile
index 299cb35..6dc18be 100755
--- a/wmifs/Makefile
+++ b/wmifs/Makefile
@@ -12,7 +12,7 @@ OBJS =	wmifs.o \
 		../wmgeneral/misc.o \
 		../wmgeneral/list.o
 
-CFLAGS = -Wall -O2 -g
+CFLAGS += -Wall -O2 -g
 
 INSTALL = /usr/bin/install
 INSTALL_DIR     = $(INSTALL) -p -d -o root -g root -m 755
@@ -23,7 +23,7 @@ INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
 	$(CC) -c $(CFLAGS) $< -o $*.o
 
 wmifs: $(OBJS)
-	$(CC) -o wmifs $^ -lXext $(LIBDIR) $(LIBS)
+	$(CC) $(LDFLAGS) -o wmifs $^ -lXext $(LIBDIR) $(LIBS)
 
 all:: wmifs
 
diff --git a/wmifs/wmifs-libc5.c b/wmifs/wmifs-libc5.c
index 8d95981..aac5d19 100644
--- a/wmifs/wmifs-libc5.c
+++ b/wmifs/wmifs-libc5.c
@@ -848,9 +848,9 @@ void get_ppp_stats(struct ppp_stats *cur) {
 
 	memset(&req, 0, sizeof(req));
 
-	req.b.ifr_ifru.ifru_data = (caddr_t) &req.stats;
+	req.stats_ptr = (caddr_t) &req.stats;
 
-	sprintf(req.b.ifr_ifrn.ifrn_name, "ppp%d", PPP_UNIT);
+	sprintf(req.ifr__name, "ppp%d", PPP_UNIT);
 
 	if (ioctl(ppp_h, SIOCGPPPSTATS, &req) < 0) {
 		fprintf(stderr, "heyho!\n");
diff --git a/wmifs/wmifs.c b/wmifs/wmifs.c
index 69e9f2b..0476b94 100644
--- a/wmifs/wmifs.c
+++ b/wmifs/wmifs.c
@@ -215,6 +215,14 @@
  /* Defines */
 /***********/
 
+#ifndef ifr__name
+#define ifr__name ifr_name
+#endif
+
+#ifndef stats_ptr
+#define stats_ptr stats.p.FIXME
+#endif
+
 /* Fill in the hardcoded actions */
 #define LEFT_ACTION (NULL)
 #define MIDDLE_ACTION (NULL)
@@ -416,6 +424,10 @@ void wmifs_routine(int argc, char **argv) {
 	parse_rcfile("/etc/wmifsrc", wmifs_keys);
 
 	p = getenv("HOME");
+	if (p == NULL || *p == 0) {
+		fprintf(stderr, "Unknown $HOME directory, please check your environment\n");
+		return;
+	}
 	strcpy(temp, p);
 	strcat(temp, "/.wmifsrc");
 	parse_rcfile(temp, wmifs_keys);
@@ -916,9 +928,9 @@ void get_ppp_stats(struct ppp_stats *cur) {
 
 	memset(&req, 0, sizeof(req));
 
-	req.b.ifr_ifru.ifru_data = (caddr_t) &req.stats;
+	req.stats_ptr = (caddr_t) &req.stats;
 
-	sprintf(req.b.ifr_ifrn.ifrn_name, "ppp%d", PPP_UNIT);
+	sprintf(req.ifr__name, "ppp%d", PPP_UNIT);
 
 	if (ioctl(ppp_h, SIOCGPPPSTATS, &req) < 0) {
 /*		fprintf(stderr, "heyho!\n"); */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmifs.git