Thu Sep 28 11:04:07 2017 UTC ()
patch the Makefiles so RELRO flags work


(spz)
diff -r1.8 -r1.9 pkgsrc/security/libcrack/distinfo
diff -r1.3 -r1.4 pkgsrc/security/libcrack/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/security/libcrack/patches/patch-ac
cvs diff -r1.8 -r1.9 pkgsrc/security/libcrack/distinfo (expand / switch to unified diff)

--- pkgsrc/security/libcrack/distinfo 2016/10/30 20:49:57 1.8
+++ pkgsrc/security/libcrack/distinfo 2017/09/28 11:04:07 1.9
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.8 2016/10/30 20:49:57 spz Exp $ 1$NetBSD: distinfo,v 1.9 2017/09/28 11:04:07 spz Exp $
2 2
3SHA1 (cracklib,2.7.tar.gz) = 903bb7e2400c7e486f432aab026dd6584815d2c1 3SHA1 (cracklib,2.7.tar.gz) = 903bb7e2400c7e486f432aab026dd6584815d2c1
4RMD160 (cracklib,2.7.tar.gz) = 8c1710580ed5778f54d30b709cac0b4b07543aed 4RMD160 (cracklib,2.7.tar.gz) = 8c1710580ed5778f54d30b709cac0b4b07543aed
5SHA512 (cracklib,2.7.tar.gz) = 2d63ed30d78a8fb07caeb21b2eeeb88941b224fe9c94da6c5eaecc4d23510117c836a373e77dffc1ff827dbd8bc02a07d07434caa4fc39b48d515bef425819e9 5SHA512 (cracklib,2.7.tar.gz) = 2d63ed30d78a8fb07caeb21b2eeeb88941b224fe9c94da6c5eaecc4d23510117c836a373e77dffc1ff827dbd8bc02a07d07434caa4fc39b48d515bef425819e9
6Size (cracklib,2.7.tar.gz) = 21059 bytes 6Size (cracklib,2.7.tar.gz) = 21059 bytes
7SHA1 (patch-CVE-2016-6318) = 8cfb44a70c1b9e23a9739edc393fc017a7327902 7SHA1 (patch-CVE-2016-6318) = 8cfb44a70c1b9e23a9739edc393fc017a7327902
8SHA1 (patch-aa) = 8119a733f4bdb0a5a41e41ab53e9923564a70855 8SHA1 (patch-aa) = 8119a733f4bdb0a5a41e41ab53e9923564a70855
9SHA1 (patch-ab) = b9a0b5929936a1335f08cab93710bbe66c74183d 9SHA1 (patch-ab) = b69fafe0b49de13a977df43fbaf8c01c06e0c2a8
10SHA1 (patch-ac) = 43031370c2bb08c7b43c6afad0fabe8060ac66b3 10SHA1 (patch-ac) = 44677705081bfd13523469137cd73fe2d9a3aadb
cvs diff -r1.3 -r1.4 pkgsrc/security/libcrack/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/libcrack/patches/patch-ab 2009/12/10 23:30:53 1.3
+++ pkgsrc/security/libcrack/patches/patch-ab 2017/09/28 11:04:07 1.4
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-ab,v 1.3 2009/12/10 23:30:53 abs Exp $ 1$NetBSD: patch-ab,v 1.4 2017/09/28 11:04:07 spz Exp $
2 2
3--- cracklib/Makefile.orig 1997-12-14 22:49:21.000000000 +0000 3--- cracklib/Makefile.orig 1997-12-14 22:49:21.000000000 +0000
4+++ cracklib/Makefile 4+++ cracklib/Makefile
5@@ -7,12 +7,16 @@ 5@@ -7,12 +7,16 @@
6 ### 6 ###
7  7
8 LIB= libcrack.a 8 LIB= libcrack.a
9-OBJ= fascist.o packlib.o rules.o stringlib.o 9-OBJ= fascist.o packlib.o rules.o stringlib.o
10-CFLAGS= -O -I../cracklib -DIN_CRACKLIB 10-CFLAGS= -O -I../cracklib -DIN_CRACKLIB
11+OBJS= fascist.o packlib.o rules.o stringlib.o 11+OBJS= fascist.o packlib.o rules.o stringlib.o
12+CFLAGS+= -I../cracklib -DIN_CRACKLIB 12+CFLAGS+= -I../cracklib -DIN_CRACKLIB
13  13
14-$(LIB): $(OBJ) 14-$(LIB): $(OBJ)
15- ar rv $(LIB) $? 15- ar rv $(LIB) $?
16- -ranlib $(LIB) 16- -ranlib $(LIB)
17+all: ${LIB} 17+all: ${LIB}
18+ 18+
19+.c.o: 19+.c.o:
20+ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $< -c -o ${.TARGET} 20+ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $< -c -o ${.TARGET}
21+ 21+
22+${LIB}: ${OBJS} 22+${LIB}: ${OBJS}
23+ ${LIBTOOL} --mode=link ${CC} -o ${@:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:7 23+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${LDFLAGS} -o ${@:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:7
24  24
25 clean: 25 clean:
26 -rm -f $(OBJ) $(LIB) *~ 26 -rm -f $(OBJ) $(LIB) *~
cvs diff -r1.2 -r1.3 pkgsrc/security/libcrack/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/security/libcrack/patches/patch-ac 2009/12/10 23:30:53 1.2
+++ pkgsrc/security/libcrack/patches/patch-ac 2017/09/28 11:04:07 1.3
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1$NetBSD: patch-ac,v 1.2 2009/12/10 23:30:53 abs Exp $ 1$NetBSD: patch-ac,v 1.3 2017/09/28 11:04:07 spz Exp $
2 2
3--- util/Makefile.orig 1997-12-14 22:49:34.000000000 +0000 3--- util/Makefile.orig 1997-12-14 22:49:34.000000000 +0000
4+++ util/Makefile 4+++ util/Makefile
5@@ -14,26 +14,26 @@ 5@@ -14,26 +14,26 @@
6 #SunOS users (and others?) should consider static linking of their passwd binary 6 #SunOS users (and others?) should consider static linking of their passwd binary
7 #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic 7 #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic
8  8
9-CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' 9-CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
10-LIBS= ../cracklib/libcrack.a 10-LIBS= ../cracklib/libcrack.a
11+CFLAGS+=-I../cracklib '-DCRACKLIB_DICTPATH="${DICTPATH}"' 11+CFLAGS+=-I../cracklib '-DCRACKLIB_DICTPATH="${DICTPATH}"'
12+LIBS= ../cracklib/.libs/libcrack.a 12+LIBS= ../cracklib/.libs/libcrack.a
13  13
14 all: packer unpacker testnum teststr testlib 14 all: packer unpacker testnum teststr testlib
15 touch all 15 touch all
16  16
17 packer: packer.o $(LIBS) 17 packer: packer.o $(LIBS)
18- cc $(CFLAGS) -o $@ $@.o $(LIBS) 18- cc $(CFLAGS) -o $@ $@.o $(LIBS)
19+ ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} 19+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
20  20
21 unpacker: unpacker.o $(LIBS) 21 unpacker: unpacker.o $(LIBS)
22- cc $(CFLAGS) -o $@ $@.o $(LIBS) 22- cc $(CFLAGS) -o $@ $@.o $(LIBS)
23+ ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} 23+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
24  24
25 testnum: testnum.o $(LIBS) 25 testnum: testnum.o $(LIBS)
26- cc $(CFLAGS) -o $@ $@.o $(LIBS) 26- cc $(CFLAGS) -o $@ $@.o $(LIBS)
27+ ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} 27+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
28  28
29 teststr: teststr.o $(LIBS) 29 teststr: teststr.o $(LIBS)
30- cc $(CFLAGS) -o $@ $@.o $(LIBS) 30- cc $(CFLAGS) -o $@ $@.o $(LIBS)
31+ ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} 31+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
32  32
33 testlib: testlib.o $(LIBS) 33 testlib: testlib.o $(LIBS)
34- cc $(CFLAGS) -o $@ $@.o $(LIBS) 34- cc $(CFLAGS) -o $@ $@.o $(LIBS)
35+ ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} 35+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ $@.o ${LIBS}
36  36
37 clean: 37 clean:
38 -rm *.o *~ all 38 -rm *.o *~ all