[xl2tpd: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/xl2tpd

[Paul Wouters]

commit 74843537d0796dcc73df0f345053d00207b13087
Merge: 6b5e36d d374fe8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 1 16:18:58 2013 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xl2tpd
    
    This also updates xl2tpd-1.3.1-Makefile to use full relro
    Conflicts:
    	xl2tpd.spec

 xl2tpd-1.3.1-Makefile                      |   21 ++++++++++
 xl2tpd-1.3.1-ipparam-to-remotenumber.patch |   29 ++++++++++++++
 xl2tpd.spec                                |   59 ++++++++++++++++------------
 3 files changed, 84 insertions(+), 25 deletions(-)
---
diff --cc xl2tpd-1.3.1-Makefile
index 0000000,0000000..b21ef78
new file mode 100644
--- /dev/null
+++ b/xl2tpd-1.3.1-Makefile
@@@ -1,0 -1,0 +1,21 @@@
++diff -Naur xl2tpd-1.3.1-orig/Makefile xl2tpd-1.3.1/Makefile
++--- xl2tpd-1.3.1-orig/Makefile	2013-04-01 16:05:42.459122589 -0400
+++++ xl2tpd-1.3.1/Makefile	2013-04-01 16:06:03.800359414 -0400
++@@ -98,6 +98,7 @@
++ #LIBS= $(OSLIBS) # -lefence # efence for malloc checking
++ EXEC=xl2tpd
++ CONTROL_EXEC=xl2tpd-control
+++CONTROL_OBJ=xl2tpd-control.o
++ 
++ PREFIX?=/usr/local
++ SBINDIR?=$(DESTDIR)${PREFIX}/sbin
++@@ -114,7 +115,8 @@
++ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
++ 
++ $(CONTROL_EXEC): $(CONTROL_SRCS)
++-	$(CC) $(CONTROL_SRCS) -o $@
+++	$(CC) $(CFLAGS) -c $(CONTROL_SRCS)
+++	$(CC) $(LDFLAGS) -o $@ $(CONTROL_OBJ)
++ 
++ pfc:
++ 	$(CC) $(CFLAGS) -c contrib/pfc.c
diff --cc xl2tpd.spec
index f48e84b,200154b..6023f6a
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@@ -13,8 -19,7 +19,9 @@@ Patch2: xl2tpd-bz80693.patc
  Patch3: xl2tpd-1.3.1-kernelmode.patch
  Patch4: xl2tpd-1.3.1-conf.patch
  Patch5: xl2tpd-1.3.1-pty.patch
- Patch6: xl2tpd-1.3.1-Makefile
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ Patch6: xl2tpd-1.3.1-ipparam-to-remotenumber.patch
++Patch7: xl2tpd-1.3.1-Makefile
++
  Requires: ppp >= 2.4.5-18, kernel-modules-extra
  # If you want to authenticate against a Microsoft PDC/Active Directory
  # Requires: samba-winbind
@@@ -57,12 -63,13 +65,18 @@@ It was de-facto maintained by Jacco de 
  %patch3 -p1
  %patch4 -p1
  %patch5 -p1
 -%patch6 -p1 
 +%patch6 -p1
++%patch7 -p1 
+ 
  rm linux/include/linux/if_pppol2tp.h 
  
  %build
  #make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH"
--make DFLAGS="$RPM_OPT_FLAGS -g "
++
++export CFLAGS="$CFLAGS -fPIC -Wall"
++export DFLAGS="$RPM_OPT_FLAGS -g "
++export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro -Wl,-z,now"
++make  
  
  %install
  rm -rf %{buildroot}