Tue Mar 11 08:53:34 2008 UTC ()
- add/update patches to introduce LDFLAGS to links in the package
  identified by Charles Zmudzinski in pr pkg/32275
- use EXPORT_SYMBOLS_LDFLAGS as suggested by salo@
- resolves pkg/32275


(rtr)
diff -r1.10 -r1.10.2.1 pkgsrc/net/rp-l2tp/Makefile
diff -r1.4 -r1.4.2.1 pkgsrc/net/rp-l2tp/distinfo
diff -r1.2 -r1.2.2.1 pkgsrc/net/rp-l2tp/patches/patch-ab
diff -r0 -r1.1.2.1 pkgsrc/net/rp-l2tp/patches/patch-ah
cvs diff -r1.10 -r1.10.2.1 pkgsrc/net/rp-l2tp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/rp-l2tp/Makefile 2007/12/22 13:01:07 1.10
+++ pkgsrc/net/rp-l2tp/Makefile 2008/03/11 08:53:34 1.10.2.1
@@ -1,30 +1,33 @@ @@ -1,30 +1,33 @@
1# $NetBSD: Makefile,v 1.10 2007/12/22 13:01:07 obache Exp $ 1# $NetBSD: Makefile,v 1.10.2.1 2008/03/11 08:53:34 rtr Exp $
2# 2#
3 3
4DISTNAME= rp-l2tp-0.3 4DISTNAME= rp-l2tp-0.3
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= net security 6CATEGORIES= net security
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rp-l2tp/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rp-l2tp/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://sourceforge.net/projects/rp-l2tp/ 10HOMEPAGE= http://sourceforge.net/projects/rp-l2tp/
11COMMENT= User-space implementation of layer 2 tunnelling protocol 11COMMENT= User-space implementation of layer 2 tunnelling protocol
12 12
13NOT_FOR_PLATFORM+= Interix-*-* # no userland protocol stack support 13NOT_FOR_PLATFORM+= Interix-*-* # no userland protocol stack support
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
 19LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
 20LDFLAGS.NetBSD+= -lutil
 21
19INSTALL_MAKE_FLAGS+= RPM_INSTALL_ROOT=${DESTDIR:Q} 22INSTALL_MAKE_FLAGS+= RPM_INSTALL_ROOT=${DESTDIR:Q}
20 23
21PKG_DESTDIR_SUPPORT= user-destdir 24PKG_DESTDIR_SUPPORT= user-destdir
22 25
23post-patch: 26post-patch:
24 for f in l2tp.conf.5 l2tpd.8; do \ 27 for f in l2tp.conf.5 l2tpd.8; do \
25 ${MV} ${WRKSRC}/man/$$f ${WRKSRC}/man/$$f.in && \ 28 ${MV} ${WRKSRC}/man/$$f ${WRKSRC}/man/$$f.in && \
26 ${SED} -e 's|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \ 29 ${SED} -e 's|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \
27 ${WRKSRC}/man/$$f.in > ${WRKSRC}/man/$$f; \ 30 ${WRKSRC}/man/$$f.in > ${WRKSRC}/man/$$f; \
28 done 31 done
29 32
30.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.4.2.1 pkgsrc/net/rp-l2tp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/rp-l2tp/distinfo 2007/12/22 13:01:08 1.4
+++ pkgsrc/net/rp-l2tp/distinfo 2008/03/11 08:53:34 1.4.2.1
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.4 2007/12/22 13:01:08 obache Exp $ 1$NetBSD: distinfo,v 1.4.2.1 2008/03/11 08:53:34 rtr Exp $
2 2
3SHA1 (rp-l2tp-0.3.tar.gz) = 3f4f08a5271f0adf1dd90567851f1a8e223ecb72 3SHA1 (rp-l2tp-0.3.tar.gz) = 3f4f08a5271f0adf1dd90567851f1a8e223ecb72
4RMD160 (rp-l2tp-0.3.tar.gz) = 25ed4a68a01c08f3acee1ce01a90673a568db55f 4RMD160 (rp-l2tp-0.3.tar.gz) = 25ed4a68a01c08f3acee1ce01a90673a568db55f
5Size (rp-l2tp-0.3.tar.gz) = 191418 bytes 5Size (rp-l2tp-0.3.tar.gz) = 191418 bytes
6SHA1 (patch-aa) = a351d8bcea431bc47a0a375c770d07e059103841 6SHA1 (patch-aa) = a351d8bcea431bc47a0a375c770d07e059103841
7SHA1 (patch-ab) = 4a30988989688b1cdc30fdd73edd7fd60509d2e3 7SHA1 (patch-ab) = 31b9b78bace8ab5c1717944e630f296b81cbbe11
8SHA1 (patch-ac) = ed6cb031b458027f7df8a97a051a1f12bc6b5e00 8SHA1 (patch-ac) = ed6cb031b458027f7df8a97a051a1f12bc6b5e00
9SHA1 (patch-ad) = 943de75b5928bca92ec739106f3c5679189557c3 9SHA1 (patch-ad) = 943de75b5928bca92ec739106f3c5679189557c3
10SHA1 (patch-ae) = 62c6d5fb9ddd69467fbb6ed6b502add0ae646a29 10SHA1 (patch-ae) = 62c6d5fb9ddd69467fbb6ed6b502add0ae646a29
11SHA1 (patch-af) = 3fa6c660ca06ddf3ea49e33e31506f714f7ef9b5 11SHA1 (patch-af) = 3fa6c660ca06ddf3ea49e33e31506f714f7ef9b5
12SHA1 (patch-ag) = 5dc50f2ace17bb97717d628e9fdfe689443966c0 12SHA1 (patch-ag) = 5dc50f2ace17bb97717d628e9fdfe689443966c0
 13SHA1 (patch-ah) = fcac0fb3c264d68df1f2dbbc0d548311abdaaa2c
cvs diff -r1.2 -r1.2.2.1 pkgsrc/net/rp-l2tp/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/rp-l2tp/patches/patch-ab 2007/12/22 13:01:08 1.2
+++ pkgsrc/net/rp-l2tp/patches/patch-ab 2008/03/11 08:53:34 1.2.2.1
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1$NetBSD: patch-ab,v 1.2 2007/12/22 13:01:08 obache Exp $ 1$NetBSD: patch-ab,v 1.2.2.1 2008/03/11 08:53:34 rtr Exp $
2 2
3--- Makefile.in.orig 2002-09-30 21:33:55.000000000 +0100 3--- Makefile.in.orig 2002-10-01 06:33:55.000000000 +1000
4+++ Makefile.in 2003-12-18 10:24:07.000000000 +0000 4+++ Makefile.in
5@@ -26,11 +26,20 @@ 5@@ -26,11 +26,20 @@ install=@INSTALL@
6 install_dir=@INSTALL@ -d 6 install_dir=@INSTALL@ -d
7 sbindir=@sbindir@ 7 sbindir=@sbindir@
8  8
9+OPSYS= $(shell uname -s) 9+OPSYS= $(shell uname -s)
10+ 10+
11 OBJS=auth.o debug.o dgram.o main.o md5.o network.o options.o peer.o session.o tunnel.o utils.o 11 OBJS=auth.o debug.o dgram.o main.o md5.o network.o options.o peer.o session.o tunnel.o utils.o
12-EXTRA_LIBS=@LIBEVENT@/*.o -ldl 12-EXTRA_LIBS=@LIBEVENT@/*.o -ldl
13+ 13+
14+ifeq (${OPSYS}, Linux) 14+ifeq (${OPSYS}, Linux)
15+EXTRA_LIBS=-ldl 15+EXTRA_LIBS=-ldl
16+DYNAMIC_FLAGS= -rdynamic 16+DYNAMIC_FLAGS= -rdynamic
17+endif 17+endif
18+ 18+
19+ifeq (${OPSYS}, NetBSD) 19+ifeq (${OPSYS}, NetBSD)
20+endif 20+endif
21  21
22 SRCS=$(OBJS:.o=.c) 22 SRCS=$(OBJS:.o=.c)
23-CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" 23-CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\"
24+CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" -DSYSCONFDIR=\""@sysconfdir@"\" 24+CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" -DSYSCONFDIR=\""@sysconfdir@"\"
25  25
26 TARGETS=l2tpd libl2tp.a handlers 26 TARGETS=l2tpd libl2tp.a handlers
27  27
28@@ -43,7 +52,7 @@ 28@@ -43,7 +52,7 @@ libl2tp.a: $(OBJS)
29  29
30 l2tpd: libl2tp.a libevent/libevent.a 30 l2tpd: libl2tp.a libevent/libevent.a
31 $(MAKE) -C handlers 31 $(MAKE) -C handlers
32- @CC@ -o l2tpd -rdynamic $(OBJS) $(EXTRA_LIBS) 32- @CC@ -o l2tpd -rdynamic $(OBJS) $(EXTRA_LIBS)
33+ @CC@ -o l2tpd $(DYNAMIC_FLAGS) $(OBJS) @LIBEVENT@/*.o $(EXTRA_LIBS) 33+ @CC@ $(LDFLAGS) -o l2tpd $(DYNAMIC_FLAGS) $(OBJS) @LIBEVENT@/*.o $(EXTRA_LIBS)
34  34
35 libevent/libevent.a: 35 libevent/libevent.a:
36 test -d libevent || ln -s ../libevent . 36 test -d libevent || ln -s ../libevent .
37@@ -82,8 +91,8 @@ 37@@ -82,8 +91,8 @@ distclean: clean
38 install: all 38 install: all
39 -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) 39 -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir)
40 $(install) -m 755 -s l2tpd $(RPM_INSTALL_ROOT)$(sbindir) 40 $(install) -m 755 -s l2tpd $(RPM_INSTALL_ROOT)$(sbindir)
41- -mkdir -p $(RPM_INSTALL_ROOT)/etc/l2tp 41- -mkdir -p $(RPM_INSTALL_ROOT)/etc/l2tp
42- $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example 42- $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example
43+ -mkdir -p $(RPM_INSTALL_ROOT)${PREFIX}/share/examples 43+ -mkdir -p $(RPM_INSTALL_ROOT)${PREFIX}/share/examples
44+ $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)${PREFIX}/share/examples/l2tp.conf 44+ $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)${PREFIX}/share/examples/l2tp.conf
45 -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man8 45 -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man8
46 -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5 46 -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5
47 $(install) -m 644 man/l2tpd.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 47 $(install) -m 644 man/l2tpd.8 $(RPM_INSTALL_ROOT)$(mandir)/man8
File Added: pkgsrc/net/rp-l2tp/patches/patch-ah
$NetBSD: patch-ah,v 1.1.2.1 2008/03/11 08:53:34 rtr Exp $

--- handlers/Makefile.in.orig	2008-03-10 15:31:14.000000000 +1100
+++ handlers/Makefile.in
@@ -28,10 +28,10 @@ cmd-control.o: cmd-control.c
 	gcc $(CFLAGS) -fPIC -c -o $@ $<
 
 sync-pppd.so: pty.o sync-pppd.o
-	gcc -shared -o $@ $^
+	gcc -shared $(LDFLAGS) -o $@ $^
 
 cmd.so: cmd.o dstring.o
-	gcc -shared -o $@ $^
+	gcc -shared $(LDFLAGS) -o $@ $^
 
 clean:
 	rm -f *.so *.o *~