[Astlinux-commits] SF.net SVN: astlinux: [182] trunk/package

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 182
Author:   krisk84
Date:     2006-07-19 11:45:13 -0700 (Wed, 19 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=182&view=rev

Log Message:
-----------
new asterisk, zaptel, pptpd support

Modified Paths:
--------------
    trunk/package/Config.in
    trunk/package/asterisk/asterisk.mk
    trunk/package/ipsec-tools/ipsec-tools.mk
    trunk/package/zaptel/zaptel-makefile0.patch
    trunk/package/zaptel/zaptel.mk

Added Paths:
-----------
    trunk/package/pptpd/
    trunk/package/pptpd/Config.in
    trunk/package/pptpd/pptpd.mk
Modified: trunk/package/Config.in
===================================================================

--- trunk/package/Config.in	2006-07-12 18:28:30 UTC (rev 181)
+++ trunk/package/Config.in	2006-07-19 18:45:13 UTC (rev 182)
@@ -124,6 +124,7 @@
 source "package/portage/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
+source "package/pptpd/Config.in"
 source "package/procps/Config.in"
 source "package/psmisc/Config.in"
 source "package/python/Config.in"

Modified: trunk/package/asterisk/asterisk.mk
===================================================================
--- trunk/package/asterisk/asterisk.mk	2006-07-12 18:28:30 UTC (rev 181)
+++ trunk/package/asterisk/asterisk.mk	2006-07-19 18:45:13 UTC (rev 182)
@@ -3,7 +3,7 @@
 # asterisk
 #
 ##############################################################
-ASTERISK_VERSION := 1.2.9.1
+ASTERISK_VERSION := 1.2.10
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
 ASTERISK_SITE := ftp://ftp.digium.com/pub/asterisk
 ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION)
@@ -39,8 +39,10 @@
 	touch $(ASTERISK_DIR)/.source
 
 $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source
+ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM)),y)	
 	cp package/asterisk/custom/*.c $(ASTERISK_DIR)/apps/
-	patch $(ASTERISK_DIR)/apps/Makefile package/asterisk/custom/Makefile.patch
+	toolchain/patch-kernel.sh package/asterisk/custom/\*.patch
+endif
 	touch $(ASTERISK_DIR)/.configured
 
 $(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured
@@ -73,7 +75,9 @@
 	chmod 640 $(TARGET_DIR)/stat/etc/asterisk/*
 	ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk
 	ln -sf $(ASTERISK_DIR) $(BUILD_DIR)/asterisk
+ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM)),y)	
 	cp -f package/asterisk/custom/*.conf $(TARGET_DIR)/stat/etc/asterisk/
+endif
 	
 asterisk: uclibc libelf ncurses zlib openssl $(ASTERISK_EXTRAS) $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
 

Modified: trunk/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/package/ipsec-tools/ipsec-tools.mk	2006-07-12 18:28:30 UTC (rev 181)
+++ trunk/package/ipsec-tools/ipsec-tools.mk	2006-07-19 18:45:13 UTC (rev 182)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSEC_TOOLS_VER:=0.6.1
+IPSEC_TOOLS_VER:=0.6.6
 IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VER).tar.bz2
 IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VER)
 
@@ -79,6 +79,7 @@
 	  --sysconfdir=/etc \
 	  --disable-hybrid \
 	  --without-libpam \
+	  --enable-dpd \
 	  --disable-gssapi \
 	  --with-kernel-headers=$(STAGING_DIR)/include \
 	  $(IPSEC_TOOLS_CONFIG_FLAGS) \

Added: trunk/package/pptpd/Config.in
===================================================================
--- trunk/package/pptpd/Config.in	                        (rev 0)
+++ trunk/package/pptpd/Config.in	2006-07-19 18:45:13 UTC (rev 182)
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_PPTPD
+	bool "pptpd"
+	default y
+	help
+	    poptop PPTP daemon

Added: trunk/package/pptpd/pptpd.mk
===================================================================
--- trunk/package/pptpd/pptpd.mk	                        (rev 0)
+++ trunk/package/pptpd/pptpd.mk	2006-07-19 18:45:13 UTC (rev 182)
@@ -0,0 +1,63 @@
+#############################################################
+#
+# pptpd
+#
+#############################################################
+PPTPD_SOURCE:=pptpd-1.3.2.tar.gz
+PPTPD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/poptop/
+PPTPD_DIR:=$(BUILD_DIR)/pptpd-1.3.2
+PPTPD_CAT:=zcat
+PPTPD_BINARY:=pptpd
+PPTPD_TARGET_BINARY:=usr/sbin/pptpd
+
+
+$(DL_DIR)/$(PPTPD_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(PPTPD_SITE)/$(PPTPD_SOURCE)
+
+
+pptpd-source: $(DL_DIR)/$(PPTPD_SOURCE)
+
+$(PPTPD_DIR)/.source: $(DL_DIR)/$(PPTPD_SOURCE) $(DL_DIR)/$(PPTPD_PATCH)
+	zcat $(DL_DIR)/$(PPTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(PPTPD_DIR)/.source
+
+
+$(PPTPD_DIR)/.configured: $(PPTPD_DIR)/.source
+	(cd $(PPTPD_DIR); \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	./configure \
+	--target=$(GNU_TARGET_NAME) \
+	--host=$(GNU_TARGET_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	);
+	touch $(PPTPD_DIR)/.configured;
+
+$(PPTPD_DIR)/$(PPTPD_BINARY): $(PPTPD_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(PPTPD_DIR)
+
+$(TARGET_DIR)/$(PPTPD_TARGET_BINARY): $(PPTPD_DIR)/$(PPTPD_BINARY)
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(PPTPD_DIR) install
+	cp $(PPTPD_DIR)/samples/pptpd.conf  $(TARGET_DIR)/etc/pptpd.conf
+	rm -Rf $(TARGET_DIR)/usr/man
+
+pptpd: uclibc $(TARGET_DIR)/$(PPTPD_TARGET_BINARY)
+
+pptpd-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(PPTPD_DIR) uninstall
+	-$(MAKE) -C $(PPTPD_DIR) clean
+
+pptpd-dirclean:
+	rm -rf $(PPTPD_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_PPTPD)),y)
+TARGETS+=pptpd
+endif
+

Modified: trunk/package/zaptel/zaptel-makefile0.patch
===================================================================
--- trunk/package/zaptel/zaptel-makefile0.patch	2006-07-12 18:28:30 UTC (rev 181)
+++ trunk/package/zaptel/zaptel-makefile0.patch	2006-07-19 18:45:13 UTC (rev 182)
@@ -1,15 +1,14 @@
-diff -ur zaptel-1.2.6.orig/Makefile zaptel-1.2.6/Makefile
---- zaptel-1.2.6.orig/Makefile	2006-05-22 19:11:36.000000000 -0400
-+++ zaptel-1.2.6/Makefile	2006-06-01 11:36:09.000000000 -0400
+--- zaptel-1.2.7.orig/Makefile	2006-07-07 14:03:59.000000000 -0400
++++ zaptel-1.2.7/Makefile	2006-07-18 09:57:52.000000000 -0400
 @@ -45,6 +45,7 @@
+ 
+ KFLAGS+=-DSTANDALONE_ZAPATA
  CFLAGS+=-DSTANDALONE_ZAPATA
++INSTALL_BASE=/usr
  KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
  KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
-+INSTALL_BASE=/usr
- EXTRA_CFLAGS:=-I$(src)
  
- ROOT_PREFIX=
-@@ -121,7 +122,7 @@
+@@ -124,7 +125,7 @@
  obj-m+=xpp/
  endif
  
@@ -18,7 +17,7 @@
  ZTTOOL:=zttool
  endif
  BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune
-@@ -188,13 +189,13 @@
+@@ -197,13 +198,13 @@
  	$(CC) -o $@ $^
  
  tones.h: gendigits
@@ -35,7 +34,7 @@
  
  gendigits: gendigits.o
  	$(CC) -o $@ $^ -lm
-@@ -322,25 +323,25 @@
+@@ -336,25 +337,25 @@
  		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \
  	fi; \
  	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2006-07-12 18:28:30 UTC (rev 181)
+++ trunk/package/zaptel/zaptel.mk	2006-07-19 18:45:13 UTC (rev 182)
@@ -3,7 +3,7 @@
 # zaptel
 #
 ##############################################################
-ZAPTEL_VERSION := 1.2.6
+ZAPTEL_VERSION := 1.2.7
 ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz
 ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel
 ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION)
@@ -44,12 +44,12 @@
 	touch $(ZAPTEL_DIR)/.configured
 
 $(ZAPTEL_DIR)/$(ZAPTEL_BINARY): $(ZAPTEL_DIR)/.configured
-	# CWD=$(shell pwd)
-	# cd $(ZAPTEL_DIR) 
-	$(MAKE1) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits #hack
+	#CWD=$(shell pwd)
+	#cd $(ZAPTEL_DIR) 
+	$(MAKE1) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits fw2h #hack
 	$(MAKE1) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
 	$(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool INSTALL_BASE=/
-	# cd $(CWD)
+	#cd $(CWD)
 
 $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY): $(ZAPTEL_DIR)/$(ZAPTEL_BINARY)
 	mkdir -p $(STAGING_DIR)/etc/udev/rules.d #hack to get install to work...
@@ -62,7 +62,7 @@
 	cp -a $(STAGING_DIR)/lib/libtone*so* $(TARGET_DIR)/lib/
 	cp -a $(STAGING_DIR)/$(ZAPTEL_TARGET_BINARY) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
 	cp -a $(STAGING_DIR)/sbin/zttool $(TARGET_DIR)/sbin/zttool
-	install -D -m 0755 $(ZAPTEL_DIR)/ztmonitor $(TARGET_DIR)/sbin/ztmonito
+	install -D -m 0755 $(ZAPTEL_DIR)/ztmonitor $(TARGET_DIR)/sbin/ztmonitor
 	-$(STRIP) -g $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/*.ko
 	-$(STRIP) -g $(TARGET_DIR)/lib/libtone*
 	-$(STRIP) -g $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



