From patchwork Sun Sep 23 12:51:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 186216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 2C2EB2C009E for ; Sun, 23 Sep 2012 22:51:17 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4F962A02F9; Sun, 23 Sep 2012 12:51:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oujUV2DgYjJS; Sun, 23 Sep 2012 12:51:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 880DFA02B4; Sun, 23 Sep 2012 12:51:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 30D638F74A for ; Sun, 23 Sep 2012 12:51:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 35CA88C87B for ; Sun, 23 Sep 2012 12:51:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bZAGHdsASA6N for ; Sun, 23 Sep 2012 12:51:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [85.10.205.246]) by whitealder.osuosl.org (Postfix) with ESMTPS id 31FBC8C769 for ; Sun, 23 Sep 2012 12:51:09 +0000 (UTC) Received: from asgard (host55.190-231-14.telecom.net.ar [190.231.14.55]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q8NCp25e031353 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 23 Sep 2012 12:51:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1348404667; bh=I0I4KtQE+RpYZGgPD0AfzHGNwFrc8MUKxDkQIfg6b4w=; h=From:To:Cc:Subject:Date; b=IWfhLxrgBuS2WAuwFC0oZHNrfXtyxPpGbn+AWKrSl+AKSW9W2EpUHTAsQ5FjeCZ/+ +rSDkTkH49OTHKW/DdYmKfmkRtDB9NHizsqG9PIU3NI6+VDr/jchHS77OdWXqFdl39 68krJkiBbVYQtRiRryj1Gnv52zWPzPgvqjUDTYUE= Received: by asgard (sSMTP sendmail emulation); Sun, 23 Sep 2012 09:51:01 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Sun, 23 Sep 2012 09:51:00 -0300 Message-Id: <1348404660-14218-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] xl2tp: bump to version 1.3.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- package/xl2tp/xl2tp-1.2.7-makefile-flags.patch | 33 -------------------- ...xl2tp-1.2.7-legacy.patch => xl2tp-legacy.patch} | 0 package/xl2tp/xl2tp.mk | 21 ++---------- 3 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 package/xl2tp/xl2tp-1.2.7-makefile-flags.patch rename package/xl2tp/{xl2tp-1.2.7-legacy.patch => xl2tp-legacy.patch} (100%) diff --git a/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch b/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch deleted file mode 100644 index 68a56a6..0000000 --- a/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch +++ /dev/null @@ -1,33 +0,0 @@ -Make sure that the CFLAGS passed on the command line are taken into -account. - ---- xl2tp-1.2.7/Makefile-orig 2010-08-05 15:33:46.000000000 -0700 -+++ xl2tp-1.2.7/Makefile 2010-09-30 22:34:54.000000000 -0700 -@@ -90,7 +90,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include - - IPFLAGS?= -DIP_ALLOCATION - --CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS) -+COMPILE_FLAGS+= $(DFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS) - HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h - OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o - SRCS=${OBJS:.o=.c} ${HDRS} -@@ -105,6 +105,9 @@ MANDIR?=$(DESTDIR)${PREFIX}/share/man - - all: $(EXEC) pfc - -+%.o: %.c -+ $(CC) $(COMPILE_FLAGS) $(CFLAGS) -c -o $@ -shared $< -+ - clean: - rm -f $(OBJS) $(EXEC) pfc.o pfc - -@@ -112,7 +115,7 @@ $(EXEC): $(OBJS) $(HDRS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) - - pfc: -- $(CC) $(CFLAGS) -c contrib/pfc.c -+ $(CC) $(COMPILE_FLAGS) $(CFLAGS) -c contrib/pfc.c - $(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o - - romfs: diff --git a/package/xl2tp/xl2tp-1.2.7-legacy.patch b/package/xl2tp/xl2tp-legacy.patch similarity index 100% rename from package/xl2tp/xl2tp-1.2.7-legacy.patch rename to package/xl2tp/xl2tp-legacy.patch diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index 768e6ec..cf0576d 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -3,31 +3,18 @@ # xl2tp # ############################################################# -XL2TP_VERSION = 1.2.7 -XL2TP_SOURCE = xl2tpd-$(XL2TP_VERSION).tar.gz -XL2TP_SITE = ftp://ftp.xelerance.com/xl2tpd/ +XL2TP_VERSION = v1.3.1 +XL2TP_SITE = http://github.com/xelerance/xl2tpd/tarball/$(XL2TP_VERSION) XL2TP_DEPENDENCIES = libpcap define XL2TP_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(SED) 's/ -O2 //' $(@D)/Makefile + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef define XL2TP_INSTALL_TARGET_CMDS $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install endef -define XL2TP_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/usr/bin/pfc - rm -f $(TARGET_DIR)/usr/sbin/xl2tpd - rm -f $(TARGET_DIR)/usr/share/man/man1/pfc.1 - rm -f $(TARGET_DIR)/usr/share/man/man8/xl2tpd.8 - rm -f $(TARGET_DIR)/usr/share/man/man5/xl2tpd.conf.5 - rm -f $(TARGET_DIR)/usr/share/man/man5/l2tp-secrets.5 -endef - -define XL2TP_CLEAN_CMDS - -$(MAKE) -C $(@D) clean -endef - $(eval $(generic-package))