CVS commit: pkgsrc/security/libcrack

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Thu Sep 28 11:04:07 UTC 2017

Modified Files:
        pkgsrc/security/libcrack: distinfo
        pkgsrc/security/libcrack/patches: patch-ab patch-ac

Log Message:
patch the Makefiles so RELRO flags work


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/libcrack/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/libcrack/patches/patch-ab
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/libcrack/patches/patch-ac

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

Modified files:

Index: pkgsrc/security/libcrack/distinfo
diff -u pkgsrc/security/libcrack/distinfo:1.8 pkgsrc/security/libcrack/distinfo:1.9
--- pkgsrc/security/libcrack/distinfo:1.8       Sun Oct 30 20:49:57 2016
+++ pkgsrc/security/libcrack/distinfo   Thu Sep 28 11:04:07 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2016/10/30 20:49:57 spz Exp $
+$NetBSD: distinfo,v 1.9 2017/09/28 11:04:07 spz Exp $
 
 SHA1 (cracklib,2.7.tar.gz) = 903bb7e2400c7e486f432aab026dd6584815d2c1
 RMD160 (cracklib,2.7.tar.gz) = 8c1710580ed5778f54d30b709cac0b4b07543aed
@@ -6,5 +6,5 @@ SHA512 (cracklib,2.7.tar.gz) = 2d63ed30d
 Size (cracklib,2.7.tar.gz) = 21059 bytes
 SHA1 (patch-CVE-2016-6318) = 8cfb44a70c1b9e23a9739edc393fc017a7327902
 SHA1 (patch-aa) = 8119a733f4bdb0a5a41e41ab53e9923564a70855
-SHA1 (patch-ab) = b9a0b5929936a1335f08cab93710bbe66c74183d
-SHA1 (patch-ac) = 43031370c2bb08c7b43c6afad0fabe8060ac66b3
+SHA1 (patch-ab) = b69fafe0b49de13a977df43fbaf8c01c06e0c2a8
+SHA1 (patch-ac) = 44677705081bfd13523469137cd73fe2d9a3aadb

Index: pkgsrc/security/libcrack/patches/patch-ab
diff -u pkgsrc/security/libcrack/patches/patch-ab:1.3 pkgsrc/security/libcrack/patches/patch-ab:1.4
--- pkgsrc/security/libcrack/patches/patch-ab:1.3       Thu Dec 10 23:30:53 2009
+++ pkgsrc/security/libcrack/patches/patch-ab   Thu Sep 28 11:04:07 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2009/12/10 23:30:53 abs Exp $
+$NetBSD: patch-ab,v 1.4 2017/09/28 11:04:07 spz Exp $
 
 --- cracklib/Makefile.orig     1997-12-14 22:49:21.000000000 +0000
 +++ cracklib/Makefile
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2009/12/10 23:30
 +      ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $< -c -o ${.TARGET}
 +
 +${LIB}:       ${OBJS}
-+      ${LIBTOOL} --mode=link ${CC} -o ${@:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:7
++      ${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${LDFLAGS} -o ${@:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:7
  
  clean:
        -rm -f $(OBJ) $(LIB) *~

Index: pkgsrc/security/libcrack/patches/patch-ac
diff -u pkgsrc/security/libcrack/patches/patch-ac:1.2 pkgsrc/security/libcrack/patches/patch-ac:1.3
--- pkgsrc/security/libcrack/patches/patch-ac:1.2       Thu Dec 10 23:30:53 2009
+++ pkgsrc/security/libcrack/patches/patch-ac   Thu Sep 28 11:04:07 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2009/12/10 23:30:53 abs Exp $
+$NetBSD: patch-ac,v 1.3 2017/09/28 11:04:07 spz Exp $
 
 --- util/Makefile.orig 1997-12-14 22:49:34.000000000 +0000
 +++ util/Makefile
@@ -16,23 +16,23 @@ $NetBSD: patch-ac,v 1.2 2009/12/10 23:30
  
  packer: packer.o $(LIBS)
 -      cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+      ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
++      ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
  
  unpacker: unpacker.o $(LIBS)
 -      cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+      ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
++      ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
  
  testnum: testnum.o $(LIBS)
 -      cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+      ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
++      ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
  
  teststr: teststr.o $(LIBS)
 -      cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+      ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
++      ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
  
  testlib: testlib.o $(LIBS)
 -      cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+      ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
++      ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
  
  clean:
        -rm *.o *~ all