CVS commit: pkgsrc/net/netcat

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul  7 11:23:01 UTC 2017

Modified Files:
        pkgsrc/net/netcat: distinfo
        pkgsrc/net/netcat/patches: patch-ae patch-af

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/netcat/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/netcat/patches/patch-ae
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/netcat/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netcat/distinfo
diff -u pkgsrc/net/netcat/distinfo:1.12 pkgsrc/net/netcat/distinfo:1.13
--- pkgsrc/net/netcat/distinfo:1.12     Wed Nov  4 00:35:15 2015
+++ pkgsrc/net/netcat/distinfo  Fri Jul  7 11:23:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.13 2017/07/07 11:23:01 wiz Exp $
 
 SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
 RMD160 (nc110.tgz) = 3e891fa094d921940e53035fb6721e2f0c04efdb
@@ -8,5 +8,5 @@ SHA1 (patch-aa) = 44dc8cf9072a1c127925a4
 SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
 SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
 SHA1 (patch-ad) = 0e6e3234a1abbec1151705a0c21bc1b7a87044f4
-SHA1 (patch-ae) = f76fb4b4c593a7951d0c62745f599ef747360514
-SHA1 (patch-af) = 45b3824ff84c2557b0016d97b0309d5c8b597690
+SHA1 (patch-ae) = 80c8fd9b6b98ff026e65a90e5360c12c16ce86db
+SHA1 (patch-af) = 379c35bd9bd4b2526eace0c8e95c9147f9b13dce

Index: pkgsrc/net/netcat/patches/patch-ae
diff -u pkgsrc/net/netcat/patches/patch-ae:1.7 pkgsrc/net/netcat/patches/patch-ae:1.8
--- pkgsrc/net/netcat/patches/patch-ae:1.7      Thu Jan 13 15:09:58 2011
+++ pkgsrc/net/netcat/patches/patch-ae  Fri Jul  7 11:23:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2011/01/13 15:09:58 pooka Exp $
+$NetBSD: patch-ae,v 1.8 2017/07/07 11:23:01 wiz Exp $
 
 --- Makefile.orig      Tue Mar 19 19:16:06 1996
 +++ Makefile   Sat Nov 22 17:32:15 2003
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.7 2011/01/13 15:09
  
  nc:   netcat.c
 -      $(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
-+      $(CC) $(CFLAGS) $(DFLAGS) $(XFLAGS) -o nc netcat.c $(XLIBS)
++      $(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) $(XFLAGS) -o nc netcat.c $(XLIBS)
  
  nc-dos:
        @echo "DOS?!  Maybe someday, but not now"

Index: pkgsrc/net/netcat/patches/patch-af
diff -u pkgsrc/net/netcat/patches/patch-af:1.1 pkgsrc/net/netcat/patches/patch-af:1.2
--- pkgsrc/net/netcat/patches/patch-af:1.1      Wed Apr 30 04:08:27 2003
+++ pkgsrc/net/netcat/patches/patch-af  Fri Jul  7 11:23:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2003/04/30 04:08:27 grant Exp $
+$NetBSD: patch-af,v 1.2 2017/07/07 11:23:01 wiz Exp $
 
 --- data/Makefile.orig Thu Mar 21 07:14:44 1996
 +++ data/Makefile
@@ -7,12 +7,12 @@ $NetBSD: patch-af,v 1.1 2003/04/30 04:08
  
  data: data.c
 -      cc -s -O -o data data.c
-+      $(CC) $(CFLAGS) -s -o data data.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -s -o data data.c
  rservice:     rservice.c
 -      cc -s -O -o rservice rservice.c
-+      $(CC) $(CFLAGS) -s -o rservice rservice.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -s -o rservice rservice.c
  xor:  xor.c
 -      cc -s -O -o xor xor.c
-+      $(CC) $(CFLAGS) -s -o xor xor.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -s -o xor xor.c
  clean:
        rm -f *.o data rservice xor