[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/dhcp/devel dhcp-3.0.3-trailing_nul_options.patch, NONE, 1.1 dhcp-3.0.3-gcc4_warnings.patch, NONE, 1.1 dhcp-3.0.3-version.patch, NONE, 1.1 dhcp.spec, 1.65, 1.66 dhcp-3.0.1-z-relro-now.patch, 1.4, 1.5



Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7017

Modified Files:
	dhcp.spec dhcp-3.0.1-z-relro-now.patch 
Added Files:
	dhcp-3.0.3-trailing_nul_options.patch 
	dhcp-3.0.3-gcc4_warnings.patch dhcp-3.0.3-version.patch 
Log Message:
- fix bug 160655: strip trailing '\0' bytes from text options before append
- fix gcc4 compiler warnings ; now compiles with -Werror
- add RPM_OPT_FLAGS to link as suggested in gcc man-page on '-pie' option
- change ISC version string to 'V3.0.3-RedHat' at request of ISC


dhcp-3.0.3-trailing_nul_options.patch:
 options.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE dhcp-3.0.3-trailing_nul_options.patch ---
--- dhcp-3.0.3/common/options.c.ISC	2004-12-03 19:03:18.000000000 -0500
+++ dhcp-3.0.3/common/options.c	2005-08-23 12:03:02.000000000 -0400
@@ -1496,6 +1496,11 @@
 	
 	op -> option = option;
 
+	if ( (*(option->format) == 't') 
+	   &&(*((option->format)+1)=='\0') 
+	   &&(op->data.data[op->data.len - 1]== '\0') 
+	   )  op->data.len -= 1;
+
 	/* Now store the option. */
 	save_option (universe, options, op);
 

dhcp-3.0.3-gcc4_warnings.patch:
 client/clparse.c         |   18 ++++++-------
 client/dhclient.c        |   64 +++++++++++++++++++++++------------------------
 common/alloc.c           |   16 +++++------
 common/comapi.c          |   38 +++++++++++++--------------
 common/discover.c        |   16 +++++------
 common/dns.c             |   10 +++----
 common/execute.c         |   18 ++++++-------
 common/icmp.c            |   10 +++----
 common/inet.c            |    2 -
 common/lpf.c             |    6 ++--
 common/memory.c          |    6 ++--
 common/options.c         |   36 +++++++++++++-------------
 common/parse.c           |   48 +++++++++++++++++------------------
 common/print.c           |    4 +-
 common/resolv.c          |   10 +++----
 common/socket.c          |    2 -
 common/tree.c            |   20 +++++++-------
 dhcpctl/callback.c       |    4 +-
 dhcpctl/cltest.c         |    6 ++--
 dhcpctl/dhcpctl.c        |   12 ++++----
 dhcpctl/omshell.c        |    8 ++---
 dhcpctl/remote.c         |   12 ++++----
 dst/dst_api.c            |   20 +++++++-------
 dst/prandom.c            |    2 -
 includes/omapip/omapip.h |    4 +-
 minires/res_mkupdate.c   |    2 -
 minires/res_update.c     |    2 -
 omapip/alloc.c           |    2 -
 omapip/array.c           |    4 +-
 omapip/buffer.c          |    6 ++--
 omapip/connection.c      |    6 ++--
 omapip/convert.c         |    2 -
 omapip/dispatch.c        |    4 +-
 omapip/errwarn.c         |   24 ++++++++---------
 omapip/generic.c         |    2 -
 omapip/handle.c          |    4 +-
 omapip/hash.c            |    6 ++--
 omapip/listener.c        |   14 +++++-----
 omapip/message.c         |   26 +++++++++----------
 omapip/mrtrace.c         |    4 +-
 omapip/protocol.c        |   14 +++++-----
 omapip/support.c         |   22 ++++++++--------
 omapip/trace.c           |    6 ++--
 relay/dhcrelay.c         |    2 -
 server/confpars.c        |   24 ++++++++---------
 server/db.c              |   10 +++----
 server/ddns.c            |    4 +-
 server/dhcp.c            |   26 +++++++++----------
 server/dhcpd.c           |   12 ++++----
 server/failover.c        |   38 +++++++++++++--------------
 server/mdb.c             |   18 ++++++-------
 server/omapi.c           |   38 +++++++++++++--------------
 52 files changed, 357 insertions(+), 357 deletions(-)

--- NEW FILE dhcp-3.0.3-gcc4_warnings.patch ---
--- dhcp-3.0.3/client/clparse.c.gcc4_warnings	2005-08-23 16:52:55.541383000 -0400
+++ dhcp-3.0.3/client/clparse.c	2005-08-23 16:52:56.978944000 -0400
@@ -39,7 +39,7 @@
 
 #include "dhcpd.h"
 
-static TIME parsed_time;
+/*static TIME parsed_time;*/
 
 struct client_config top_level_config;
 
@@ -65,7 +65,7 @@
 isc_result_t read_client_conf ()
 {
 	struct client_config *config;
-	struct client_state *state;
+/*	struct client_state *state;*/
 	struct interface_info *ip;
 	isc_result_t status;
 
@@ -245,11 +245,11 @@
 	int token;
 	const char *val;
 	struct option *option;
-	struct executable_statement *stmt, **p;
-	enum statement_op op;
+	struct executable_statement *stmt;/*, **p;
+	enum statement_op op;*/
 	int lose;
 	char *name;
-	struct data_string key_id;
+/*	struct data_string key_id;*/
 	enum policy policy;
 	int known;
 	int tmp, i;
@@ -966,11 +966,11 @@
 {
 	int token;
 	const char *val;
-	char *t, *n;
+/*	char *t, *n;*/
 	struct interface_info *ip;
 	struct option_cache *oc;
 	struct client_state *client = (struct client_state *)0;
-	struct data_string key_id;
+/*	struct data_string key_id;*/
 
 	switch (next_token (&val, (unsigned *)0, cfile)) {
 	      case KEY:
@@ -1160,12 +1160,12 @@
 	struct parse *cfile;
 	int flag;
 {
-	enum dhcp_token token;
+/*	enum dhcp_token token;
 	const char *val;
 	unsigned char rf = flag;
 	struct expression *data = (struct expression *)0;
 	int status;
-
+*/
 	parse_warn (cfile, "allow/deny/ignore not permitted here.");
 	skip_to_semi (cfile);
 	return 0;
--- dhcp-3.0.3/client/dhclient.c.gcc4_warnings	2005-08-23 16:52:56.885038000 -0400
+++ dhcp-3.0.3/client/dhclient.c	2005-08-23 16:52:57.014908000 -0400
@@ -99,7 +99,7 @@
 	omapi_object_t *listener;
 	isc_result_t result;
 	int persist = 0;
-	int omapi_port;
+/*	int omapi_port;*/
 	int no_dhclient_conf = 0;
 	int no_dhclient_db = 0;
 	int no_dhclient_pid = 0;
@@ -335,24 +335,24 @@
 	}else
 	{
 	    FILE *pidfp=0L;
-	    pid_t dhcpid=0;
+	    int   dhcpid=0;
 	    int   dhc_running=0;
 	    char  procfn[256]="";
-	    
+
 	    if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL ) 	   
 	    {
-		 if( (fscanf(pidfp, "%ld", &dhcpid)==1) 
+		 if( (fscanf(pidfp, "%d", &dhcpid)==1) 
 		   &&(dhcpid > 0)
-		    )
+		   )
 		 {
-		     snprintf(procfn,256,"/proc/%ld",dhcpid);
+		     snprintf(procfn,256,"/proc/%d",dhcpid);
 		     dhc_running = ( access(procfn, F_OK) == 0 );		     
 		 }
 		 fclose(pidfp);
 	    }
 	    if( dhc_running )
 	    {
-		log_fatal("dhclient(%ld) is already running - exiting. ", dhcpid);
+		log_fatal("dhclient(%ld) is already running - exiting. ", (long)dhcpid);
 		return(1);
 	    }	    
 	}	
@@ -753,7 +753,7 @@
 			picked = lp;
 			picked -> next = (struct client_lease *)0;
 		} else {
-		      freeit:
+/*		      freeit:*/
 			destroy_client_lease (lp);
 		}
 	}
@@ -812,7 +812,7 @@
 	struct client_lease *lease;
 	struct option_cache *oc;
 	struct data_string ds;
-	int i;
+/*	int i;*/
 	
 	/* If we're not receptive to an offer right now, or if the offer
 	   has an unrecognizable transaction id, then just drop it. */
@@ -966,7 +966,7 @@
 void bind_lease (client)
 	struct client_state *client;
 {
-	struct interface_info *ip = client -> interface;
+/*	struct interface_info *ip = client -> interface;*/
 
 	/* Remember the medium. */
 	client -> new -> medium = client -> medium;
@@ -1033,7 +1033,7 @@
 	void *cpp;
 {
 	struct client_state *client = cpp;
-	int i;
+/*	int i;*/
 	struct option_cache *oc;
 	struct data_string ds;
 
@@ -1076,7 +1076,7 @@
 	void *cpp;
 {
 	struct client_state *client = cpp;
-	int i;
+/*	int i;*/
 
 	/* Cancel all timeouts. */
 	cancel_timeout (state_selecting, client);
@@ -1189,8 +1189,8 @@
 	int i;
 	int stop_selecting;
 	const char *name = packet -> packet_type ? "DHCPOFFER" : "BOOTREPLY";
-	struct iaddrlist *ap;
-	struct option_cache *oc;
+/*	struct iaddrlist *ap;
+	struct option_cache *oc;*/
 	char obuf [1024];
 	
 #ifdef DEBUG_PACKET
@@ -1992,7 +1992,7 @@
 	struct client_lease *lease;
 {
 	unsigned char discover = DHCPDISCOVER;
-	int i;
+/*	int i;*/
 	struct option_state *options = (struct option_state *)0;
 
 	memset (&client -> packet, 0, sizeof (client -> packet));
@@ -2056,9 +2056,9 @@
 	struct client_lease *lease;
 {
 	unsigned char request = DHCPREQUEST;
-	int i, j;
+/*	int i, j;
 	unsigned char *tmp, *digest;
-	unsigned char *old_digest_loc;
+	unsigned char *old_digest_loc;*/
 	struct option_cache *oc;
 
 	memset (&client -> packet, 0, sizeof (client -> packet));
@@ -2146,7 +2146,7 @@
 	struct client_lease *lease;
 {
 	unsigned char decline = DHCPDECLINE;
-	int i;
+/*	int i;*/
 	struct option_cache *oc;
 
 	struct option_state *options = (struct option_state *)0;
@@ -2202,7 +2202,7 @@
 	struct client_lease *lease;
 {
 	unsigned char request = DHCPRELEASE;
-	int i;
+/*	int i;*/
 	struct option_cache *oc;
[...2316 lines suppressed...]
 		return ISC_R_INVALIDARG;
@@ -455,7 +455,7 @@
 {
 	struct lease *lease;
 	isc_result_t status;
-	int updatep = 0;
+/*	int updatep = 0;*/
 
 	if (h -> type != dhcp_type_lease)
 		return ISC_R_INVALIDARG;
@@ -859,9 +859,9 @@
 				   omapi_data_string_t *name,
 				   omapi_typed_data_t *value)
 {
-	struct host_decl *host, *hp;
+        struct host_decl *host/*, *hp*/;
 	isc_result_t status;
-	int foo;
+/*	int foo;*/
 
 	if (h -> type != dhcp_type_host)
 		return ISC_R_INVALIDARG;
@@ -1120,7 +1120,7 @@
 isc_result_t dhcp_host_destroy (omapi_object_t *h, const char *file, int line)
 {
 	struct host_decl *host;
-	isc_result_t status;
+/*	isc_result_t status;*/
 
 	if (h -> type != dhcp_type_host)
 		return ISC_R_INVALIDARG;
@@ -1541,7 +1541,7 @@
 {
 	struct pool *pool;
 	isc_result_t status;
-	int foo;
+/*	int foo;*/
 
 	if (h -> type != dhcp_type_pool)
 		return ISC_R_INVALIDARG;
@@ -1587,8 +1587,8 @@
 isc_result_t dhcp_pool_destroy (omapi_object_t *h, const char *file, int line)
 {
 	struct pool *pool;
-	isc_result_t status;
-	struct permit *pc, *pn;
+/*	isc_result_t status;
+	struct permit *pc, *pn*/;
 
 	if (h -> type != dhcp_type_pool)
 		return ISC_R_INVALIDARG;
@@ -1685,10 +1685,10 @@
 isc_result_t dhcp_pool_lookup (omapi_object_t **lp,
 			       omapi_object_t *id, omapi_object_t *ref)
 {
-	omapi_value_t *tv = (omapi_value_t *)0;
+/*	omapi_value_t *tv = (omapi_value_t *)0;
 	isc_result_t status;
 	struct pool *pool;
-
+*/
 	/* Can't look up pools yet. */
 
 	/* If we get to here without finding a pool, no valid key was
@@ -1717,7 +1717,7 @@
 {
 	struct class *class;
 	isc_result_t status;
-	int foo;
+/*	int foo;*/
 
 	if (h -> type != dhcp_type_class)
 		return ISC_R_INVALIDARG;
@@ -1763,8 +1763,8 @@
 isc_result_t dhcp_class_destroy (omapi_object_t *h, const char *file, int line)
 {
 	struct class *class;
-	isc_result_t status;
-	int i;
+/*	isc_result_t status;
+        int i;*/
 
 	if (h -> type != dhcp_type_class && h -> type != dhcp_type_subclass)
 		return ISC_R_INVALIDARG;
@@ -1864,9 +1864,9 @@
 isc_result_t dhcp_class_lookup (omapi_object_t **lp,
 				omapi_object_t *id, omapi_object_t *ref)
 {
-	omapi_value_t *tv = (omapi_value_t *)0;
+/*	omapi_value_t *tv = (omapi_value_t *)0;
 	isc_result_t status;
-	struct class *class;
+        struct class *class;*/
 
 	/* Can't look up classs yet. */
 
@@ -1896,7 +1896,7 @@
 {
 	struct subclass *subclass;
 	isc_result_t status;
-	int foo;
+/*	int foo;*/
 
 	if (h -> type != dhcp_type_subclass)
 		return ISC_R_INVALIDARG;
@@ -1991,9 +1991,9 @@
 isc_result_t dhcp_subclass_lookup (omapi_object_t **lp,
 				   omapi_object_t *id, omapi_object_t *ref)
 {
-	omapi_value_t *tv = (omapi_value_t *)0;
+/*	omapi_value_t *tv = (omapi_value_t *)0;
 	isc_result_t status;
-	struct subclass *subclass;
+	struct subclass *subclass;*/
 
 	/* Can't look up subclasss yet. */
 
--- dhcp-3.0.3/server/dhcp.c.gcc4_warnings	2005-04-29 19:10:57.000000000 -0400
+++ dhcp-3.0.3/server/dhcp.c	2005-08-23 16:52:57.607316000 -0400
@@ -406,7 +406,7 @@
 	int ours = 0;
 	struct option_cache *oc;
 	struct data_string data;
-	int status;
+/*	int status;*/
 	char msgbuf [1024]; /* XXX */
 	const char *s;
 	char smbuf [19];
@@ -947,14 +947,14 @@
 	char msgbuf [1024];
 	struct data_string d1, prl;
 	struct option_cache *oc;
-	struct expression *expr;
+/*	struct expression *expr;*/
 	struct option_state *options = (struct option_state *)0;
 	struct dhcp_packet raw;
 	struct packet outgoing;
 	unsigned char dhcpack = DHCPACK;
 	struct subnet *subnet = (struct subnet *)0;
 	struct iaddr cip;
-	unsigned i, j;
+	unsigned i/*, j*/;
 	int nulltp;
 	struct sockaddr_in to;
 	struct in_addr from;
@@ -1292,7 +1292,7 @@
 	unsigned i;
 	struct data_string data;
 	struct option_state *options = (struct option_state *)0;
-	struct expression *expr;
+/*	struct expression *expr;*/
 	struct option_cache *oc = (struct option_cache *)0;
 	struct iaddr myfrom;
 
@@ -1498,15 +1498,15 @@
 	TIME max_lease_time;
 	TIME default_lease_time;
 	struct option_cache *oc;
-	struct expression *expr;
-	int status;
+/*	struct expression *expr;
+        int status;*/
 	isc_result_t result;
-	int did_ping = 0;
+/*	int did_ping = 0;*/
 	TIME ping_timeout;
 
 	unsigned i, j;
-	int s1, s2;
-	int val;
+	int s1;/*, s2;
+	int val;*/
 	int ignorep;
 
 	/* If we're already acking this lease, don't do it again. */
@@ -2723,12 +2723,12 @@
 	struct in_addr from;
 	struct hardware hto;
 	int result;
-	int i;
+/*	int i;*/
 	struct lease_state *state = lease -> state;
 	int nulltp, bootpp, unicastp = 1;
-	struct option_tag *ot, *not;
+/*	struct option_tag *ot, *not;*/
 	struct data_string d1;
-	struct option_cache *oc;
+/*	struct option_cache *oc;*/
 	const char *s;
 
 	if (!state)
@@ -2949,7 +2949,7 @@
 	struct data_string d1;
 	int have_client_identifier = 0;
 	struct data_string client_identifier;
-	int status;
+/*	int status;*/
 	struct hardware h;
 
 	if (packet -> raw -> ciaddr.s_addr) {

dhcp-3.0.3-version.patch:
 version.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dhcp-3.0.3-version.patch ---
--- dhcp-3.0.3/includes/version.h.version	2005-07-22 16:44:58.000000000 -0400
+++ dhcp-3.0.3/includes/version.h	2005-08-23 17:05:09.995761000 -0400
@@ -1,3 +1,3 @@
 /* Current version of ISC DHCP Distribution. */
 
-#define DHCP_VERSION	"V3.0.3"
+#define DHCP_VERSION	"V3.0.3-RedHat"


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- dhcp.spec	9 Aug 2005 22:01:51 -0000	1.65
+++ dhcp.spec	23 Aug 2005 21:27:54 -0000	1.66
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.3
-Release: 2
+Release: 3
 Epoch:   11
 License: distributable
 Group: System Environment/Daemons
@@ -58,6 +58,9 @@
 Patch151: dhcp-3.0.3rc1-boot-file-server.patch
 Patch152: dhcp-3.0.3-fast_dhclient.patch
 Patch153: dhcp-3.0.3-dhclient-script-ypbind-hup-ok.patch
+Patch154: dhcp-3.0.3-trailing_nul_options.patch
+Patch155: dhcp-3.0.3-gcc4_warnings.patch
+Patch156: dhcp-3.0.3-version.patch
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -158,7 +161,9 @@
 # next-server or server-name options for the tftp-boot-server.
 %patch152 -p1 -b .fast_dhclient
 %patch153 -p1 -b .ypbind_hup_ok
-
+%patch154 -p1 -b .trailing_nul_options
+%patch155 -p1 -b .gcc4_warnings
+%patch156 -p1 -b .version
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcp
@@ -179,6 +184,7 @@
 #include <stdio.h>
 int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
 EOF
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Dlint -Werror"
 cc -o findptrsize findptrsize.c
 [ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
 %ifarch s390 s390x
@@ -190,6 +196,7 @@
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DEXTENDED_NEW_OPTION_INFO"
 %endif
 #RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'`
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 ./configure --copts "$RPM_OPT_FLAGS"
 # -DDEBUG_PACKET -DDEBUG_EXPRESSIONS"
 # -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3"
@@ -290,6 +297,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 23 2005 Jason Vas Dias <jvdias redhat com> - 11:3.0.3-3
+- fix bug 160655: strip trailing '\0' bytes from text options before append
+- fix gcc4 compiler warnings ; now compiles with -Werror
+- add RPM_OPT_FLAGS to link as suggested in gcc man-page on '-pie' option
+- change ISC version string to 'V3.0.3-RedHat' at request of ISC
+
 * Tue Aug  9 2005 Jeremy Katz <katzj redhat com> - 11:3.0.3-2
 - don't explicitly require 2.2 era kernel, it's fairly overkill at this point
 

dhcp-3.0.1-z-relro-now.patch:
 client/Makefile.dist  |    2 +-
 dhcpctl/Makefile.dist |    4 ++--
 relay/Makefile.dist   |    2 +-
 server/Makefile.dist  |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

Index: dhcp-3.0.1-z-relro-now.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.1-z-relro-now.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dhcp-3.0.1-z-relro-now.patch	16 Feb 2005 00:40:57 -0000	1.4
+++ dhcp-3.0.1-z-relro-now.patch	23 Aug 2005 21:27:54 -0000	1.5
@@ -1,45 +1,45 @@
---- dhcp-3.0.2rc3/client/Makefile.dist.-z-relro-now	2004-06-10 13:59:11.000000000 -0400
-+++ dhcp-3.0.2rc3/client/Makefile.dist	2005-02-15 18:59:07.000000000 -0500
+--- dhcp-3.0.3/client/Makefile.dist.-z-relro-now	2004-06-10 13:59:11.000000000 -0400
++++ dhcp-3.0.3/client/Makefile.dist	2005-08-23 17:14:27.224974000 -0400
 @@ -128,6 +128,6 @@
  
  
  dhclient:	$(OBJS) $(DHCPLIB)
 -	$(CC) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS)
-+	$(CC) $(LFLAGS) -pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS)
++	$(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS)
  
  # Dependencies (semi-automatically-generated)
---- dhcp-3.0.2rc3/dhcpctl/Makefile.dist.-z-relro-now	2004-06-10 13:59:23.000000000 -0400
-+++ dhcp-3.0.2rc3/dhcpctl/Makefile.dist	2005-02-15 18:59:07.000000000 -0500
+--- dhcp-3.0.3/dhcpctl/Makefile.dist.-z-relro-now	2005-03-03 11:55:23.000000000 -0500
++++ dhcp-3.0.3/dhcpctl/Makefile.dist	2005-08-23 17:15:59.599507000 -0400
 @@ -37,10 +37,10 @@
  all:	libdhcpctl.a omshell cltest $(CATMANPAGES)
  
  omshell:	omshell.o $(DHCPCTLLIBS)
 -	$(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
-+	$(CC) $(DEBUG) $(LFLAGS) -pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
++	$(CC) $(DEBUG) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
  
  cltest:	cltest.o $(DHCPCTLLIBS)
 -	$(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
-+	$(CC) $(DEBUG) $(LFLAGS) -pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
++	$(CC) $(DEBUG) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
  
  libdhcpctl.a:	$(OBJ)
  	rm -f libdhcpctl.a
---- dhcp-3.0.2rc3/relay/Makefile.dist.-z-relro-now	2004-06-10 13:59:50.000000000 -0400
-+++ dhcp-3.0.2rc3/relay/Makefile.dist	2005-02-15 19:38:57.903752000 -0500
+--- dhcp-3.0.3/relay/Makefile.dist.-z-relro-now	2004-06-10 13:59:50.000000000 -0400
++++ dhcp-3.0.3/relay/Makefile.dist	2005-08-23 17:15:24.597544000 -0400
 @@ -83,6 +83,6 @@
  		-e "s#RUNDIR#$(VARRUN)#" < dhcrelay.8 >dhcrelay.man8
  
  dhcrelay:	dhcrelay.o $(DHCPLIB)
 -	$(CC) $(LFLAGS) -o $(PROG) dhcrelay.o $(DHCPLIB) $(LIBS)
-+	$(CC) $(LFLAGS) -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack -o $(PROG) dhcrelay.o $(DHCPLIB) $(LIBS)
++	$(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack -o $(PROG) dhcrelay.o $(DHCPLIB) $(LIBS)
  
  # Dependencies (semi-automatically-generated)
---- dhcp-3.0.2rc3/server/Makefile.dist.-z-relro-now	2005-02-15 18:59:05.000000000 -0500
-+++ dhcp-3.0.2rc3/server/Makefile.dist	2005-02-15 18:59:07.000000000 -0500
+--- dhcp-3.0.3/server/Makefile.dist.-z-relro-now	2005-08-23 16:55:12.282505000 -0400
++++ dhcp-3.0.3/server/Makefile.dist	2005-08-23 17:14:50.156020000 -0400
 @@ -103,6 +103,6 @@
  		-e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5
  
  dhcpd:	$(OBJS) $(COBJ) $(DHCPLIB)
 -	$(CC) $(LFLAGS) -pie -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS)
-+	$(CC) $(LFLAGS) -pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS)
++	$(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS)
  
  # Dependencies (semi-automatically-generated)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]