Fixed two bad pointers - thanks to DaPhreak in IRC.

  Re-enabled building with -fPIC and CFLAGS.
(Portage version: 2.0.51.22-r1)

5 files changed, 45 insertions, 36 deletions

diff --git a/net-misc/pump/ChangeLog b/net-misc/pump/ChangeLog
index ca0cc7626dba..eb579950ae81 100644
--- a/net-misc/pump/ChangeLog
+++ b/net-misc/pump/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for net-misc/pump
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.19 2005/07/15 15:40:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.20 2005/07/15 16:32:16 uberlord Exp $
+
+*pump-0.8.21-r7 (15 Jul 2005)
 
   15 Jul 2005; Roy Marples <uberlord@gentoo.org>
-  files/pump-0.8.21-gentoo.diff:
-  Fixed a bad domain pointer - thanks to DaPhreak in IRC
+  files/pump-0.8.21-gentoo.diff, -pump-0.8.21-r6.ebuild,
+  +pump-0.8.21-r7.ebuild:
+  Fixed two bad pointers - thanks to DaPhreak in IRC.
+  Re-enabled building with -fPIC and CFLAGS.
 
 *pump-0.8.21-r6 (14 Jul 2005)
 
diff --git a/net-misc/pump/Manifest b/net-misc/pump/Manifest
index 1814770dc119..b1ebe38ca28a 100644
--- a/net-misc/pump/Manifest
+++ b/net-misc/pump/Manifest
@@ -1,10 +1,11 @@
-MD5 128b73d6c6e8b488c096fef459657294 pump-0.8.21-r6.ebuild 1424
+MD5 42b5bd8e52430091aafc846ff2c8712a x 3872
 MD5 4c6b8d7f8184a00ee8adf70f36c63f71 pump-0.8.11-r1.ebuild 688
 MD5 42b5bd8e52430091aafc846ff2c8712a ChangeLog 3872
 MD5 94fe4b6cace933a6aaedd7fb52194eca metadata.xml 288
+MD5 80b6dbff7542b2ef2d852d248dc542da pump-0.8.21-r7.ebuild 1453
 MD5 9b00840a5ad1b3f1a8742b0fb6699969 pump-0.8.19-r1.ebuild 815
 MD5 dbccd88cdb05d334ef22e298091382e3 files/pump.conf 155
-MD5 f3e80515c4994d15e18d1c17c0740970 files/digest-pump-0.8.21-r6 132
-MD5 64cf3a79f1fbddd98c0aabe649317477 files/pump-0.8.21-gentoo.diff 20016
+MD5 f3e80515c4994d15e18d1c17c0740970 files/digest-pump-0.8.21-r7 132
+MD5 d392ca15c9b4bd656b2bfdc185ba654d files/pump-0.8.21-gentoo.diff 20131
 MD5 2b45c75857947cb4866c175f48304eda files/digest-pump-0.8.19-r1 67
 MD5 7158de78d2fd79881a6b2cbf4e13803c files/digest-pump-0.8.11-r1 67
diff --git a/net-misc/pump/files/digest-pump-0.8.21-r7 b/net-misc/pump/files/digest-pump-0.8.21-r7
new file mode 100644
index 000000000000..0a9f7d804d9f
--- /dev/null
+++ b/net-misc/pump/files/digest-pump-0.8.21-r7
@@ -0,0 +1,2 @@
+MD5 a6925de6cd011605237934a907f8a9c4 pump_0.8.21.orig.tar.gz 79289
+MD5 22e1a2a142117fe41781e5437a03fcdb pump_0.8.21-2.diff.gz 22259
diff --git a/net-misc/pump/files/pump-0.8.21-gentoo.diff b/net-misc/pump/files/pump-0.8.21-gentoo.diff
index b0ffcb5a05a9..62388b551812 100644
--- a/net-misc/pump/files/pump-0.8.21-gentoo.diff
+++ b/net-misc/pump/files/pump-0.8.21-gentoo.diff
@@ -1,6 +1,6 @@
-diff -U 0 -r pump-0.8.21/config.c pump-0.8.21-r6/config.c
---- pump-0.8.21/config.c	2005-07-14 19:26:30.000000000 +0100
-+++ pump-0.8.21-r6/config.c	2005-07-14 18:49:34.000000000 +0100
+diff -U 0 pump-0.8.21/config.c pump-0.8.21-r7/config.c
+--- pump-0.8.21/config.c	2005-07-15 17:14:04.000000000 +0100
++++ pump-0.8.21-r7/config.c	2005-07-15 14:48:32.000000000 +0100
 @@ -158 +158,18 @@
 -	} else if (!strcmp(start, "domainsearch")) {
 +	} else if (!strcmp(start, "routemetric")) {
@@ -68,9 +68,10 @@ diff -U 0 -r pump-0.8.21/config.c pump-0.8.21-r6/config.c
 -		return 1;
 -	    }
 -
-diff -U 0 -r pump-0.8.21/dhcp.c pump-0.8.21-r6/dhcp.c
---- pump-0.8.21/dhcp.c	2005-07-14 19:26:30.000000000 +0100
-+++ pump-0.8.21-r6/dhcp.c	2005-07-14 19:12:34.000000000 +0100
+Common subdirectories: pump-0.8.21/debian and pump-0.8.21-r7/debian
+diff -U 0 pump-0.8.21/dhcp.c pump-0.8.21-r7/dhcp.c
+--- pump-0.8.21/dhcp.c	2005-07-15 17:14:04.000000000 +0100
++++ pump-0.8.21-r7/dhcp.c	2005-07-15 14:48:32.000000000 +0100
 @@ -205,0 +206 @@
 +    struct sockaddr_in * addrp;
 @@ -212,2 +212,0 @@
@@ -177,9 +178,10 @@ diff -U 0 -r pump-0.8.21/dhcp.c pump-0.8.21-r6/dhcp.c
 @@ -1435 +1464 @@
 -    pumpDhcpClassRun(device, flags, reqLease, reqHostname, NULL, intf,
 +    return pumpDhcpClassRun(device, flags, reqLease, reqHostname, NULL, intf,
-diff -U 0 -r pump-0.8.21/pump.8 pump-0.8.21-r6/pump.8
---- pump-0.8.21/pump.8	2005-07-14 19:26:30.000000000 +0100
-+++ pump-0.8.21-r6/pump.8	2005-07-14 18:49:34.000000000 +0100
+Common subdirectories: pump-0.8.21/po and pump-0.8.21-r7/po
+diff -U 0 pump-0.8.21/pump.8 pump-0.8.21-r7/pump.8
+--- pump-0.8.21/pump.8	2005-07-15 17:14:04.000000000 +0100
++++ pump-0.8.21-r7/pump.8	2005-07-15 14:48:32.000000000 +0100
 @@ -2,0 +3 @@
 +.\" July 2005: Updated by Roy Marples <uberlord@gentoo.org>
 @@ -31,0 +33,2 @@
@@ -244,9 +246,9 @@ diff -U 0 -r pump-0.8.21/pump.8 pump-0.8.21-r6/pump.8
 +Lower metrics take a higher priority.
 +
 +.TP
-diff -U 0 -r pump-0.8.21/pump.c pump-0.8.21-r6/pump.c
---- pump-0.8.21/pump.c	2005-07-14 19:26:30.000000000 +0100
-+++ pump-0.8.21-r6/pump.c	2005-07-14 19:41:33.000000000 +0100
+diff -U 0 pump-0.8.21/pump.c pump-0.8.21-r7/pump.c
+--- pump-0.8.21/pump.c	2005-07-15 17:14:04.000000000 +0100
++++ pump-0.8.21-r7/pump.c	2005-07-15 17:09:01.000000000 +0100
 @@ -100,111 +100,2 @@
 -char * readSearchPath(void) {
 -    int fd;
@@ -433,25 +435,25 @@ diff -U 0 -r pump-0.8.21/pump.c pump-0.8.21-r6/pump.c
 -    char *arg;
 +void setupDns(struct pumpNetIntf * intf) {
 +    struct pumpOverrideInfo *o = &intf->override;
-+    char * hn, * dn = NULL;
++    char * hn = NULL, * dn = NULL;
 +    struct hostent * he;
-@@ -288,5 +167 @@
+@@ -288 +167 @@
 -    if (override->flags & OVERRIDE_FLAG_NODNS)
--	return;
++    if (o->flags & OVERRIDE_FLAG_NODNS)
+@@ -290,6 +169,2 @@
 -    if (override->flags & OVERRIDE_FLAG_NORESOLVCONF)
 -	return;
 -    if (stat("/sbin/resolvconf", &buf) < 0)
-+    if (o->flags & OVERRIDE_FLAG_NODNS)
-@@ -294,2 +169,2 @@
+-	return;
 -    if (asprintf(&arg, "/sbin/resolvconf -d %s", intf->device) < 0) {
 -	syslog(LOG_ERR, "failed to release resolvconf: %s", strerror(errno));
 +
 +    if (!intf->set & PUMP_NETINFO_HAS_DNS)
-@@ -296,0 +172,16 @@
+@@ -296,0 +172,22 @@
 +    
 +    if (o->searchPath[0]) {
 +	dn = o->searchPath;
-+    } else if (intf-> set & PUMP_NETINFO_HAS_DOMAIN) {
++    } else if (intf->set & PUMP_NETINFO_HAS_DOMAIN) {
 +	dn = intf->domain;
 +    } else if (intf->set & PUMP_NETINFO_HAS_HOSTNAME) {
 +	hn = intf->hostname;
@@ -464,16 +466,16 @@ diff -U 0 -r pump-0.8.21/pump.c pump-0.8.21-r6/pump.c
 +	} else {
 +	    hn = NULL;
 +	}
-@@ -299,3 +190,7 @@
--    if (system(arg) != 0)
--	syslog(LOG_ERR, "resolvconf -d %s failed", intf->device);
--    free(arg);
++    }
++
 +    if (hn) {
 +	dn = strchr(hn, '.');
 +	if (dn)
 +	    dn++;
-+    }
-+
+@@ -299,3 +196 @@
+-    if (system(arg) != 0)
+-	syslog(LOG_ERR, "resolvconf -d %s failed", intf->device);
+-    free(arg);
 +    createResolvConf(intf, dn);
 @@ -304,8 +199,5 @@
 -static void callIfupPost(struct pumpNetIntf* intf) {
@@ -638,9 +640,9 @@ diff -U 0 -r pump-0.8.21/pump.c pump-0.8.21-r6/pump.c
 +	    strcpy(o->etcDir, etcDir);
 +	if (searchPath)
 +	    strcpy(o->searchPath, searchPath);
-diff -U 0 -r pump-0.8.21/pump.h pump-0.8.21-r6/pump.h
---- pump-0.8.21/pump.h	2005-07-14 19:26:30.000000000 +0100
-+++ pump-0.8.21-r6/pump.h	2005-07-14 18:49:34.000000000 +0100
+diff -U 0 pump-0.8.21/pump.h pump-0.8.21-r7/pump.h
+--- pump-0.8.21/pump.h	2005-07-15 17:14:04.000000000 +0100
++++ pump-0.8.21-r7/pump.h	2005-07-15 14:48:32.000000000 +0100
 @@ -57 +57,3 @@
 -#define OVERRIDE_FLAG_NORESOLVCONF	(1 << 5)
 +/* #define OVERRIDE_FLAG_NORESOLVCONF	(1 << 5) */
diff --git a/net-misc/pump/pump-0.8.21-r6.ebuild b/net-misc/pump/pump-0.8.21-r7.ebuild
index 6889e561eee9..381f131f08b7 100644
--- a/net-misc/pump/pump-0.8.21-r6.ebuild
+++ b/net-misc/pump/pump-0.8.21-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/pump-0.8.21-r6.ebuild,v 1.1 2005/07/14 19:02:57 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/pump-0.8.21-r7.ebuild,v 1.1 2005/07/15 16:32:16 uberlord Exp $
 
 inherit eutils
 
@@ -37,7 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	make pump || die
+	make DEB_CFLAGS="-fPIC ${CFLAGS}" pump || die
 }
 
 src_install() {