[Astlinux-commits] SF.net SVN: astlinux: [1145] trunk

[<kr...@us...>]

Revision: 1145
          http://svn.sourceforge.net/astlinux/?rev=1145&view=rev
Author:   krisk84
Date:     2007-07-18 21:59:13 -0700 (Wed, 18 Jul 2007)

Log Message:
-----------
Numerous openser and rtpproxy fixes and improvements:

- Update to OpenSER 1.2.1
- Enable tls by default
- Create openser user and group
- Install dbtext openserctl by default
- Make sure we install bash into target
- Enable many new config variables for both
  OpenSER and rtpproxy - see rc.conf

Modified Paths:
--------------
    trunk/package/openser/Config.in
    trunk/package/openser/openser.init
    trunk/package/openser/openser.mk
    trunk/target/generic/target_skeleton/stat/etc/rc.conf

Modified: trunk/package/openser/Config.in
===================================================================
--- trunk/package/openser/Config.in	2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/package/openser/Config.in	2007-07-19 04:59:13 UTC (rev 1145)
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_OPENSER
 	bool "openser"
 	default n
+	select BR2_PACKAGE_BASH
+	select BR2_PACKAGE_OPENSSL
 	help
 	  OpenSER is a mature and flexible open source SIP server (RFC3261).
 

Modified: trunk/package/openser/openser.init
===================================================================
--- trunk/package/openser/openser.init	2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/package/openser/openser.init	2007-07-19 04:59:13 UTC (rev 1145)
@@ -3,6 +3,8 @@
 . /etc/rc.conf
 
 init () {
+mkdir /var/run/openser
+
 if [ -d /mnt/kd/openser ]
 then
 ln -s /mnt/kd/openser /tmp/etc/openser
@@ -17,24 +19,36 @@
 }
 
 start () {
+
+if [ ! "$RTPPROXY_SOCKET" ]
+then
+RTPPROXY_SOCKET="udp:127.0.0.1:7890"
+fi
+
+if [ ! "$RTPPROXY_TOS" ]
+then
+RTPPROXY_TOS="0x18"
+fi
+
 if [ "$RTPPROXY_IP" ]
 then
 echo "Starting rtpproxy..."
-rtpproxy -l $RTPPROXY_IP -s unix:/var/run/rtpproxy.sock
+rtpproxy -l "$RTPPROXY_IP" -s "$RTPPROXY_SOCKET" -t "$RTPPROXY_TOS"
 fi
 
-if [ -f /tmp/etc/openser/openser.cfg ]
+if [ "$OPENSERUSER" -a "$OPENSERGROUP" -a -r /etc/openser/openser.cfg ]
 then
 echo "Starting openser..."
-openser
+
+openser -u "$OPENSERUSER" -g "$OPENSERGROUP" -P /var/run/openser.pid 
 fi
 }
 
 stop () {
-if [ -f /tmp/etc/openser/openser.cfg ]
+if [ -r /var/run/openser.pid ]
 then
 echo "Stopping openser..."
-killall openser 2> /dev/null
+kill `cat /var/run/openser.pid`
 fi
 
 if [ -r /var/run/rtpproxy.pid ]

Modified: trunk/package/openser/openser.mk
===================================================================
--- trunk/package/openser/openser.mk	2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/package/openser/openser.mk	2007-07-19 04:59:13 UTC (rev 1145)
@@ -3,10 +3,10 @@
 # openser & rtpproxy
 #
 ##############################################################
-OPENSER_VERSION := 1.1.1-notls_src
+OPENSER_VERSION := 1.2.1-tls_src
 OPENSER_SOURCE := openser-$(OPENSER_VERSION).tar.gz
-OPENSER_SITE := http://www.openser.org/pub/openser/1.1.1/src
-OPENSER_DIR := $(BUILD_DIR)/openser-1.1.1-notls
+OPENSER_SITE := http://www.openser.org/pub/openser/1.2.1/src
+OPENSER_DIR := $(BUILD_DIR)/openser-1.2.1-tls
 OPENSER_BINARY := openser
 OPENSER_TARGET_BINARY := usr/sbin/openser
 
@@ -65,10 +65,11 @@
 		prefix="" \
 		bin-prefix=/usr/ \
 		cfg-prefix=/ \
-		extra_defs="-DUSE_PTHREAD_MUTEX "  \
+		extra_defs="-DUSE_PTHREAD_MUTEX " \
 		CC="$(TARGET_CC)" \
 		ARCH="$(ARCH)"  \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		TLS=1 \
 		all
 	touch -c $(TARGET_DIR)/$(OPENSER_BINARY)
 
@@ -79,7 +80,13 @@
 	ln -sf /tmp/etc/openser $(TARGET_DIR)/etc/openser
 	$(INSTALL) -D -m 0640 package/openser/openser.cfg $(TARGET_DIR)/stat/etc/openser/openser.cfg
 	$(INSTALL) -D -m 0755 package/openser/openser.init $(TARGET_DIR)/etc/init.d/openser
-	$(INSTALL) -D -m 0755 $(OPENSER_DIR)/scripts/openserctl $(TARGET_DIR)/usr/sbin/openserctl
+	# $(INSTALL) -D -m 0755 $(OPENSER_DIR)/scripts/openserctl $(TARGET_DIR)/usr/sbin/openserctl
+	$(INSTALL) -D -m 0755 $(OPENSER_DIR)/scripts/sc.dbtext $(TARGET_DIR)/usr/sbin/openserctl
+	sed -e 's,/bin/sh,/bin/bash,' -i $(TARGET_DIR)/usr/sbin/openserctl
+	sed -e 's,/usr/local/etc/openser,/etc/openser,g' -i $(TARGET_DIR)/usr/sbin/openserctl
+	echo "openser:x:5060:5060:openser:/usr/share/empty:/bin/false" >> $(TARGET_DIR)/etc/passwd
+	echo "openser:!:3656:0:99999:7:::" >> $(TARGET_DIR)/etc/shadow
+	echo "openser:x:5060:" >> $(TARGET_DIR)/etc/group
 	$(INSTALL) -D -m 0755 $(OPENSER_DIR)/$(OPENSER_BINARY) $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
 	$(STRIP) $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
 	touch -c $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
@@ -95,7 +102,7 @@
 rtpproxy-dirclean:
 	-rm -rf $(RTPPROXY_DIR)
 
-openser: uclibc $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
+openser: uclibc bash openssl $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
 
 openser-source: $(DL_DIR)/$(OPENSER_SOURCE)
 

Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf	2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf	2007-07-19 04:59:13 UTC (rev 1145)
@@ -490,11 +490,19 @@
 ##For diskless clients, the image to use for booting.
 #BOOTPFILE="/pxelinux.0"
 
+##OpenSER Support
+##If your build was compiled with OpenSER, you can configure that here
+##OpenSER will not start until you define a user and group to run under
+#OPENSERUSER="openser"
+#OPENSERGROUP="openser"
+
 ##rtpproxy support
 ##If your build was built with rtpproxy support, you can configure the 
 ##listen IP here. This is really only useful if you have OpenSER too
 ##You can use other variables from this file
 #RTPPROXY_IP="$EXTIP"
+#RTPPROXY_SOCKET="udp:127.0.0.1:7890"
+#RTPPROXY_TOS="0x18"
 
 ###Mail Config
 


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