Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2013-06-06 23:49:36
|
Revision: 6117
http://sourceforge.net/p/astlinux/code/6117
Author: abelbeck
Date: 2013-06-06 23:49:34 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
asterisk, add support for /mnt/kd/dictate and /mnt/kd/monitor/meetme per Darrick's suggestion
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.init
branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions
Modified: branches/1.0/package/asterisk/asterisk.init
===================================================================
--- branches/1.0/package/asterisk/asterisk.init 2013-06-04 21:35:06 UTC (rev 6116)
+++ branches/1.0/package/asterisk/asterisk.init 2013-06-06 23:49:34 UTC (rev 6117)
@@ -42,6 +42,12 @@
if [ -L /var/spool/asterisk/monitor ]; then
rm -f /var/spool/asterisk/monitor
fi
+ if [ -L /var/spool/asterisk/meetme ]; then
+ rm -f /var/spool/asterisk/meetme
+ fi
+ if [ -L /var/spool/asterisk/dictate ]; then
+ rm -f /var/spool/asterisk/dictate
+ fi
fi
cp -a /stat/var/spool/asterisk/* /var/spool/asterisk/
@@ -49,6 +55,13 @@
make_symlink_or_dir "/mnt/kd/monitor" "/var/spool/asterisk/monitor"
+ if [ -d /mnt/kd/monitor ] && [ ! -d /mnt/kd/monitor/meetme ]; then
+ mkdir /mnt/kd/monitor/meetme
+ fi
+ make_symlink_or_dir "/mnt/kd/monitor/meetme" "/var/spool/asterisk/meetme"
+
+ make_symlink_or_dir "/mnt/kd/dictate" "/var/spool/asterisk/dictate"
+
make_symlink_or_dir "/mnt/kd/asterisk" "/tmp/etc/asterisk"
if [ $? -eq 1 ]; then
cp -a /stat/etc/asterisk/* /tmp/etc/asterisk/
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions 2013-06-04 21:35:06 UTC (rev 6116)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions 2013-06-06 23:49:34 UTC (rev 6117)
@@ -19,6 +19,7 @@
mkdir ${1}/home
mkdir ${1}/monitor
+ mkdir ${1}/dictate
mkdir ${1}/dahdi
if [ -f /stat/etc/dahdi/system.conf ]; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-07-12 18:10:50
|
Revision: 6130
http://sourceforge.net/p/astlinux/code/6130
Author: abelbeck
Date: 2013-07-12 18:10:44 +0000 (Fri, 12 Jul 2013)
Log Message:
-----------
New package 'asterisk-fop2', adds the framework for supporting the 'Flash Operator Panel 2' (free for 15 buttons, very reasonable for unlimited). The actual 'fop2' code is downloaded on ASTURW as a 'package' using the new CLI command 'upgrade-package'
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
branches/1.0/package/lighttpd/lighttpd.conf
branches/1.0/package/lighttpd/lighttpd.init
branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union
branches/1.0/toolchain/file_exclude
Added Paths:
-----------
branches/1.0/package/asterisk-fop2/
branches/1.0/package/asterisk-fop2/Config.in
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/package/asterisk-fop2/config/
branches/1.0/package/asterisk-fop2/config/buttons.cfg
branches/1.0/package/asterisk-fop2/config/fop2.cfg
branches/1.0/package/asterisk-fop2/fop2.init
branches/1.0/project/astlinux/target_skeleton/stat/var/packages/
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/astlinux-ast11.config 2013-07-12 18:10:44 UTC (rev 6130)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6103-dirty Configuration
-# Sun May 26 15:57:43 2013
+# Buildroot 2011.08-svn6129-dirty Configuration
+# Fri Jul 12 11:14:34 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -170,6 +170,7 @@
#
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
+BR2_PACKAGE_ASTERISK_FOP2=y
BR2_PACKAGE_ASTERISK_GUI=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/astlinux.config 2013-07-12 18:10:44 UTC (rev 6130)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6103-dirty Configuration
-# Sun May 26 15:57:35 2013
+# Buildroot 2011.08-svn6129-dirty Configuration
+# Fri Jul 12 11:14:23 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -176,6 +176,7 @@
BR2_PACKAGE_ASTERISK_APP_WAITUNTIL=y
BR2_PACKAGE_ASTERISK_FUNC_DEVSTATE=y
BR2_PACKAGE_ASTERISK_FUNC_EXTSTATE=y
+BR2_PACKAGE_ASTERISK_FOP2=y
BR2_PACKAGE_ASTERISK_GUI=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/astlinux18.config 2013-07-12 18:10:44 UTC (rev 6130)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6103-dirty Configuration
-# Sun May 26 15:57:40 2013
+# Buildroot 2011.08-svn6129-dirty Configuration
+# Fri Jul 12 11:14:30 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -170,6 +170,7 @@
#
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
+BR2_PACKAGE_ASTERISK_FOP2=y
BR2_PACKAGE_ASTERISK_GUI=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/package/Config.in 2013-07-12 18:10:44 UTC (rev 6130)
@@ -12,6 +12,7 @@
source "package/asterisk-codec-silk/Config.in"
source "package/asterisk-func_devstate/Config.in"
source "package/asterisk-func_extstate/Config.in"
+source "package/asterisk-fop2/Config.in"
source "package/asterisk-gui/Config.in"
source "package/dahdi-linux/Config.in"
source "package/dahdi-tools/Config.in"
Added: branches/1.0/package/asterisk-fop2/Config.in
===================================================================
--- branches/1.0/package/asterisk-fop2/Config.in (rev 0)
+++ branches/1.0/package/asterisk-fop2/Config.in 2013-07-12 18:10:44 UTC (rev 6130)
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_ASTERISK_FOP2
+ bool "asterisk-fop2"
+ depends on BR2_PACKAGE_ASTERISK
+ default n
+ help
+ Asterisk Operator Panel 2
+ Free version for up to 15 buttons.
+
+ Note: Only the supporting framework is included on the AstLinux image,
+ use the CLI command...
+ "upgrade-package fop2 upgrade"
+ to install 'fop2' at runtime.
+
+ http://www.fop2.com/
+
Added: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk (rev 0)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2013-07-12 18:10:44 UTC (rev 6130)
@@ -0,0 +1,28 @@
+#############################################################
+#
+# asterisk-fop2
+#
+#############################################################
+ASTERISK_FOP2_VERSION = 2.27
+ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
+ASTERISK_FOP2_SITE = http://download.fop2.com
+# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
+
+define ASTERISK_FOP2_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 package/asterisk-fop2/fop2.init $(TARGET_DIR)/etc/init.d/fop2
+ $(INSTALL) -D -m 0644 package/asterisk-fop2/config/fop2.cfg $(TARGET_DIR)/stat/etc/fop2/fop2.cfg
+ $(INSTALL) -D -m 0644 package/asterisk-fop2/config/buttons.cfg $(TARGET_DIR)/stat/etc/fop2/buttons.cfg
+ ln -snf /tmp/etc/fop2 $(TARGET_DIR)/etc/fop2
+ ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/S82fop2
+ ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/K00fop2
+endef
+
+define ASTERISK_FOP2_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/etc/init.d/fop2
+ rm -rf $(TARGET_DIR)/stat/etc/fop2
+ rm -f $(TARGET_DIR)/etc/fop2
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S82fop2
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K00fop2
+endef
+
+$(eval $(call GENTARGETS,package,asterisk-fop2))
Added: branches/1.0/package/asterisk-fop2/config/buttons.cfg
===================================================================
--- branches/1.0/package/asterisk-fop2/config/buttons.cfg (rev 0)
+++ branches/1.0/package/asterisk-fop2/config/buttons.cfg 2013-07-12 18:10:44 UTC (rev 6130)
@@ -0,0 +1,46 @@
+;
+; Example FOP2 Buttons
+;
+;[SIP/620]
+;type=extension
+;extension=620
+;context=from-internal
+;label=Nicolas
+;mailbox=620@default
+;extenvoicemail=*620@from-internal
+;external=5551234@from-internal
+;privacy=clid
+;queuechannel=Local/620@from-queue/n|Penalty=1|MemberName=Nicolas|StateInterface=SIP/620
+;
+;[SIP/621]
+;type=extension
+;extension=621
+;context=from-internal
+;label=Mary
+;mailbox=621@default
+;extenvoicemail=*621@from-internal
+;external=5554444@from-internal
+;privacy=monitor
+;cssclass=someExtraCSSClass
+;
+;[QUEUE/100]
+;type=queue
+;label=Sales
+;extension=100
+;context=from-internal
+;tags=sales,london
+;
+;[DAHDI/1]
+;type=trunk
+;label=DAHDI
+;channel=DAHDI/2
+;channel=DAHDI/3
+;channel=DAHDI/4
+;
+;[CONFERENCE/1000]
+;type=conference
+;label=Test Conference
+;server=1
+;extension=1000
+;context=from-internal
+
Added: branches/1.0/package/asterisk-fop2/config/fop2.cfg
===================================================================
--- branches/1.0/package/asterisk-fop2/config/fop2.cfg (rev 0)
+++ branches/1.0/package/asterisk-fop2/config/fop2.cfg 2013-07-12 18:10:44 UTC (rev 6130)
@@ -0,0 +1,241 @@
+[general]
+; AMI definitions
+manager_host=localhost
+manager_port=5038
+manager_user=admin
+manager_secret=amp111
+;event_mask=agent,call,command,system,user,dialplan
+
+; Daemon definitios
+;listen_port = 4445
+;restrict_host = www.asternic.org
+web_dir = /stat/var/packages/fop2/html
+
+; Global Config
+poll_interval = 86400
+poll_voicemail = 1
+monitor_ipaddress = 0
+
+; Force blind transfer on asterisk 1.6
+blind_transfer = 1
+
+; Force supervised transfer on asterisk 1.4
+; requires the atxfer manager backport patch
+; supervised_transfer = 1
+
+; Force delimiter for asterisk applications
+; force_parameter_delimiter = ","
+
+; When adding or removing members to a queue, fop2 will default to
+; AddQueueMember/RemoveQueueMember commands. If you set use_agentlogin
+; to 1, together with the QueueChannel in a button definition set to
+; an Agent number it will use AgentCallbackLogin and Agentlogoff instead.
+;
+; use_agentlogin = 0
+
+
+; Master Password that overrides any individual one
+;master_key = 5678
+
+
+
+; Options to send to chan_spy when doing a Listen action
+; This global setting is overriden by the individual button
+; spyoptions directive if set (in the button config).
+; Asterisk 1.6.1 or higher has the option "d" that lets you
+; switch spying modes using the keypad:
+;4 = spy mode
+;5 = whisper mode
+;6 = barge mode
+spy_options="bq"
+
+; Options to send to chan_spy when doing a Whisper action
+; In Asterisk 1.6.1 or higher you can use B to enable barge (speak
+; to both channels on a call).
+whisper_options = "w"
+
+; When you spy to an ongoing call, your spy session will end as
+; soon as the conversation you are listening to finishes. If you
+; rather keep the chan spy session open after the call end, uncomment
+; the following line.
+;persistent_spy=1
+
+; Filename to use when start monitoring, you can use ${UNIQUEID},
+; ${ORIG_EXTENSION}, ${DEST_EXTENSION}
+; and date formats %Y %m %d to construct the filename.
+;
+; Settings for modifying the recording filename
+; Available variables are:
+; ${UNIQUEID} = Unique Id of the call
+; ${TIMESTAMP} = Unix Timestamp when the recording was initiated
+; ${CLIDNUM} = Callerid or Dialed number for the active call
+; ${CLIDNAME} = Callerid name for the active call
+; ${DEST_EXTENSION} = Target extenstion being monitored
+; ${ORIG_EXTENSION} = Extension/User that started the recording (not
+; the other leg)
+; ${MBOX} = Mailbox of the extension/user that started the
+; recording
+; ${FOP2CONTEXT} = FOP2 Panel Context
+;
+; Date variables:
+; %Y 4 digits year
+; %y 2 digits year
+; %m 2 digits month
+; %d 2 digits day
+; %h 2 digits hour
+; %i 2 digits minute
+; %s 2 digits seconds
+
+; For elastix Monitoring Tab:
+; monitor_filename=g${DEST_EXTENSION}-${UNIQUEID}
+
+; For fop2 recording interface
+monitor_filename=/var/spool/asterisk/monitor/${ORIG_EXTENSION}_${DEST_EXTENSION}_%h%i%s_${UNIQUEID}
+monitor_format=wav
+monitor_mix=true
+
+; To enable the recording interface you must uncomment the following
+; line, but also you might need to modify the script a little bit
+; depending on the sox version you have installed.
+;
+;monitor_exec=/usr/local/fop2/recording_fop2.pl
+
+; You could specify your own script to be executed when the recording
+; is finished. It will receive 3 parameters, the complete
+; path and filename of the IN leg, the OUT leg and the final
+; recording NAME. You should run soxmix in your script to join
+; the recordings into one file.
+;
+; monitor_exec=/var/lib/asterisk/bin/postrecording-script.sh
+
+; FOP2 can fire notifications/popups when an extension or queue
+; member receives a call. The default behaviour is to show a
+; notification on state RINGING (notify_on_ringing=1).
+;
+; To customize notifications, you must uncomment the custom_popup
+; function in checkdir.php you can replace that notification with
+; a custom popup function to integrate with other web applications.
+;
+; For call centers you might need to perform a popup not on the
+; RINGING state but when the call is CONNECTED to an agent. If you
+; set in the queue configuration in queues.conf the option
+; eventwhencalled=yes and then set here notify_on_connect=1,
+; fop2 will send notifications on queue connected calls
+; during AGENTCONNECT events. This will only work for inbound calls
+; from a queue.
+;
+; notify_on_ringing = 1
+; notify_on_connect = 1
+
+; Call pickup uses the pickupmark variable by default. In multi tenant
+; systems this might lead to problems as you might end un picking up
+; some other tenant call. In that case you might want to try to
+; pickup the call by its context uncomenting the following line:
+;
+; no_pickupmark=1
+
+; If your asterisk version supports the pickupchan application it is
+; much better to use this than the regular pickup application as it will
+; be directed towards the channel and not the extension, makeing it
+; more precise.
+;
+; use_pickupchan=1
+
+; Path to your voicemail directory
+; For voicemail to work the fop2 server must run on the same server
+; as asterisk, or your voicemail directory must be network mounted
+voicemail_path=/var/spool/asterisk/voicemail
+
+; For odbc based voicemail storage, you can set voicemail path to
+; dbi:ODBC:name , where name is the dsn name as setup in odbc.ini
+; By default the voicemessages table will be used, if you use a
+; different one, you can specify it by appending !tablename
+;
+;voicemail_path=dbi:ODBC:asterisk!voicemessages
+
+; By default IM chats are not logged/saved. If you uncomment
+; the following parameter, all chats will be stored on the chatlog
+; table inside the fop2settings.db sqlite database.
+;
+; save_chat_log=1
+
+
+; Khomp GSM interface to send SMS messages
+; If there is a card plugged, fop2 will auto discover it
+; and use the first one available. If you want to change it
+; to a fixed one, uncomemnt the folowing line and change the name
+; to your liking
+;
+; khomp_gsm=Khomp/b0
+
+; Chan Dongle interface to send SMS messages
+;
+; dongle_gsm=dongle01
+
+; SMS Web based API
+;
+; It is possible to define a web based sms provider to send SMS via FOP2
+; The parameters to set are sms_api_url, smps_api_method, sms_api_user,
+; sms_api_password and sms_api_reponse_error
+;
+; The sms_api_url parameter must include the parameters to send to the API
+; provider to send the message, you can use the following variables on them
+; ${MESSAGE} The sms message to send
+; ${NUMBER} The destination number to send the SMS
+;
+; The sms_api_response_error is the string returned by the web call if
+; there was an error with the sending. The default value is 'error', but
+; some providers might respond with some other strings. Anything returned
+; that does not contain the error string will be considered as a successful
+; delivery
+;
+; Sample to send SMS via yx wireless gateways, replace GATEWAY_ADDRESS,
+; USER and PASSWORD with the correct values for your system:
+;
+; sms_api_url=http://GATEWAY_ADDRESS/cgi-bin/exec?cmd=api_queue_sms&username=USER&password=PASSWORD&content=${MESSAGE}&destination=${NUMBER}&api_version=0.05&channel=1
+; sms_api_method=GET
+; sms_api_user=USER
+; sms_api_password=PASSWORD
+
+; Sample to send SMS via smsified.com service, replace SERVICENUMBER,
+; USER and PASSWORD with the correct values for your system:
+;
+; sms_api_url=http://api.smsified.com/v1/smsmessaging/outbound/SERVICENUMBER/requests?address=${NUMBER}&message=${MESSAGE}
+; sms_api_method=POST
+; sms_api_user=USER
+; sms_api_password=PASSWORD
+; sms_api_response_error=error
+
+
+; --- SAMPLE CUSTOM PERMISSIONS ---
+; format: perm= CUSTOM_NAME : PERMISSIONS : DEVICES
+; perm=salessupervisor:hangup,spy,queuemanager:SIP/604,SIP/607,SIP/605,SIP/606
+;
+; A custom permission can later be assigned to a user, you cannot use
+; a reserved permission name for it or you will have issues.
+; --- END SAMPLE ---
+
+
+; --- SAMPLE GROUPS ---
+; group=queues:QUEUE/100,QUEUE/101
+; group=deptA:SIP/100,SIP/101,SIP/102
+; --- END SAMPLE ---
+
+; --- SAMPLE USER LIST ---
+; format: user= EXTENSION : SECRET : PERMISSIONS : GROUPS
+; You can enumerate several permissions and groups separated by comma
+; available permissions: 'all', 'dial', 'hangup', 'meetme', 'pickup',
+; 'record', 'spy', 'transfer', 'whisper',
+; 'queuemanager', 'queueagent', 'phonebook',
+; 'chat', 'preferences', 'hangupself',
+; 'recordself', 'voicemailadmin'
+;
+; user=620:1234:all:queues
+; user=621:1234:dial,transfer,pickup:deptA
+; user=622:1234:all
+; user=623:1234:meetme,pickup
+; buttonfile=buttons.cfg
+; ------ END SAMPLE ------
+
+buttonfile=buttons.cfg
+
Added: branches/1.0/package/asterisk-fop2/fop2.init
===================================================================
--- branches/1.0/package/asterisk-fop2/fop2.init (rev 0)
+++ branches/1.0/package/asterisk-fop2/fop2.init 2013-07-12 18:10:44 UTC (rev 6130)
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+## Package: fop2
+## Description: Flash Operator Panel 2
+## Requirements: Asterisk AMI
+
+# No variables required
+#. /etc/rc.conf
+
+PACKAGES_DIR="/stat/var/packages"
+
+FOP2_SERVER="$PACKAGES_DIR/fop2/server/fop2_server"
+
+PIDFILE="/var/run/fop2.pid"
+
+TMPSIZEMAX=30000
+
+init () {
+
+ if [ ! -x $FOP2_SERVER ]; then
+ return
+ fi
+
+ if [ ! -d /mnt/kd/fop2 ]; then
+ cp -a /stat/etc/fop2 /mnt/kd/
+ fi
+ ln -snf /mnt/kd/fop2 /tmp/etc/fop2
+
+ if [ $(df -k /tmp | awk '/ \/tmp$/ { print $2; nextfile }') -lt ${TMPSIZEMAX} ]; then
+ mount -o remount,size=${TMPSIZEMAX}k /tmp
+ fi
+}
+
+start () {
+
+ if [ ! -x $FOP2_SERVER ]; then
+ return
+ fi
+
+ if [ -f /etc/fop2/fop2.cfg ]; then
+ echo "Starting Asterisk FOP2..."
+ $FOP2_SERVER -d -c /etc/fop2 -p $PIDFILE
+ fi
+}
+
+stop () {
+
+ if [ -f $PIDFILE ]; then
+ echo "Stopping Asterisk FOP2..."
+ kill $(cat $PIDFILE) >/dev/null 2>&1
+ rm -f $PIDFILE
+ fi
+}
+
+reload () {
+
+ if [ -f $PIDFILE ]; then
+ echo "Reloading Asterisk FOP2..."
+ kill -HUP $(cat $PIDFILE)
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+reload)
+ reload
+ ;;
+
+*)
+ echo "Usage: start|stop|restart|reload"
+ ;;
+
+esac
+
Property changes on: branches/1.0/package/asterisk-fop2/fop2.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/package/lighttpd/lighttpd.conf 2013-07-12 18:10:44 UTC (rev 6130)
@@ -140,7 +140,7 @@
@CLI_PROXY_SERVER@ )
@CLI_PROXY_SERVER@}
-@PHO...@al... = ( "/phoneprov/" => "/mnt/kd/phoneprov/" )
+@PHO...@al... += ( "/phoneprov/" => "/mnt/kd/phoneprov/" )
@PHONEPROV@
@PHONEPROV@$HTTP["url"] =~ "^/phoneprov/" {
@PHONEPROV@ $HTTP["remoteip"] !~ "^(@PHONEPROV_ALLOW@)$" {
@@ -148,3 +148,5 @@
@PHONEPROV@ }
@PHONEPROV@}
+@FO...@al... += ( "/fop2/" => "/stat/var/packages/fop2/html/" )
+
Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/package/lighttpd/lighttpd.init 2013-07-12 18:10:44 UTC (rev 6130)
@@ -90,6 +90,11 @@
else
phoneprov_allow=".*"
fi
+ if [ -d /stat/var/packages/fop2/html ]; then
+ fop2=""
+ else
+ fop2="#"
+ fi
sed -i -e "s|@HOSTNAME@|${HOSTNAME}|g" \
-e "s|@HTTPDIR@|${httpdir}|g" \
@@ -104,6 +109,7 @@
-e "s|@CLI_PROXY_SERVER@|${cli_proxy_server}|g" \
-e "s|@PHONEPROV@|${phoneprov}|g" \
-e "s!@PHONEPROV_ALLOW@!${phoneprov_allow}!g" \
+ -e "s|@FOP2@|${fop2}|g" \
/tmp/etc/lighttpd.conf
}
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union 2013-07-12 18:10:44 UTC (rev 6130)
@@ -6,12 +6,14 @@
ASTERISK_SOUNDS="stat/var/lib/asterisk/sounds"
ASTERISK_MOH="stat/var/lib/asterisk/moh"
+PACKAGES="stat/var/packages"
system()
{
find $ASTURW | grep -v -e "^$ASTURW/$KD" \
-e "^$ASTURW/$ASTERISK_SOUNDS" \
- -e "^$ASTURW/$ASTERISK_MOH"
+ -e "^$ASTURW/$ASTERISK_MOH" \
+ -e "^$ASTURW/$PACKAGES"
}
kd()
@@ -37,6 +39,15 @@
fi
}
+packages()
+{
+ if [ -d $ASTURW/$PACKAGES ]; then
+ find $ASTURW/$PACKAGES
+ else
+ echo "No Installed Packages on ASTURW." >&2
+ fi
+}
+
all()
{
find $ASTURW
@@ -63,12 +74,16 @@
asterisk_sounds
;;
+packages)
+ packages
+ ;;
+
all)
all
;;
*)
- echo "Usage: show-union [ system kd asterisk_sounds all ]"
+ echo "Usage: show-union [ system|kd|asterisk_sounds|packages|all ]"
exit 1
;;
Added: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2013-07-12 18:10:44 UTC (rev 6130)
@@ -0,0 +1,233 @@
+#!/bin/sh
+# red color error message for web interface
+RED=1
+# orange color error message for web interface
+ORANGE=2
+# green color message for web interface
+GREEN=0
+#
+# Base packages directory
+BASE="/stat/var/packages"
+# Lockfile
+LOCKFILE="/var/lock/upgrade-package.lock"
+#
+
+upgrade() {
+ local suffix="${SRC_URL##*.}" tar_args pkg_dir err_str sha1
+
+ case $suffix in
+ tgz|gz) tar_args="-xzf" ;;
+ bz2) tar_args="-xjf" ;;
+ *)
+ finish $RED "Package '$PKG' invalid file suffix: $suffix"
+ ;;
+ esac
+
+ # Create empty temporary directory to download into
+ if [ -d $BASE/dl ]; then
+ rm -rf $BASE/dl
+ fi
+ mkdir -p $BASE/dl
+
+ if ! wget -q -c -O $BASE/dl/$PKG.$suffix.sha1 "$SRC_URL.sha1" >/dev/null; then
+ finish $RED "Package '$PKG' SHA1 download failed."
+ fi
+
+ if [ -f $BASE/$PKG/.sha1 ] && cmp -s $BASE/dl/$PKG.$suffix.sha1 $BASE/$PKG/.sha1; then
+ finish $ORANGE "Package '$PKG' is already installed."
+ fi
+
+ if ! wget -q -c -O $BASE/dl/$PKG.$suffix "$SRC_URL" >/dev/null; then
+ finish $RED "Package '$PKG' download failed."
+ fi
+
+ cd $BASE
+ sha1="$(cat dl/$PKG.$suffix.sha1 | awk '{ print $2; exit; }')"
+ mv dl/$PKG.$suffix dl/${sha1#dl/}
+ if ! sha1sum -cs dl/$PKG.$suffix.sha1; then
+ finish $RED "Package '$PKG' SHA1 verification failed."
+ fi
+ mv dl/${sha1#dl/} dl/$PKG.$suffix
+
+ # Make sure the package is stopped
+ service $PKG stop >/dev/null 2>&1
+
+ if [ -d $BASE/$PKG ]; then
+ if [ -d $BASE/$PKG-OLD ]; then
+ rm -rf $BASE/$PKG-OLD
+ fi
+ mv $BASE/$PKG $BASE/$PKG-OLD
+ fi
+
+ # Create empty temporary directory to untar into
+ if [ -d $BASE/TMP ]; then
+ rm -rf $BASE/TMP
+ fi
+ mkdir $BASE/TMP
+
+ tar $tar_args $BASE/dl/$PKG.$suffix -C $BASE/TMP
+ TAR_ARCHIVE_RTN=$?
+ pkg_dir="$(find $BASE/TMP/* -type d -maxdepth 0 | head -n1)"
+ if [ -n "$pkg_dir" ]; then
+ mv "$pkg_dir" $BASE/$PKG
+ fi
+ rm -rf $BASE/TMP
+ sync
+
+ if [ $TAR_ARCHIVE_RTN -eq 0 ] && [ -d $BASE/$PKG ]; then
+ cp $BASE/dl/$PKG.$suffix.sha1 $BASE/$PKG/.sha1
+ else
+ if [ ! -d $BASE/$PKG ]; then
+ err_str="Package '$PKG' expanded incorrectly"
+ else
+ err_str="Not enough free space for package '$PKG'"
+ rm -rf $BASE/$PKG
+ fi
+ if [ ! -d $BASE/$PKG-OLD ]; then
+ finish $RED "$err_str, '$PKG' is not running."
+ fi
+ mv $BASE/$PKG-OLD $BASE/$PKG
+ finish $RED "$err_str, reverted to previous, '$PKG' is not running."
+ fi
+}
+
+revert() {
+
+ if [ ! -d $BASE/$PKG ]; then
+ finish $RED "Package '$PKG' not installed."
+ fi
+
+ if [ ! -d $BASE/$PKG-OLD ]; then
+ finish $RED "No previous '$PKG' package to revert to."
+ fi
+
+ # Make sure the package is stopped
+ service $PKG stop >/dev/null 2>&1
+
+ mv $BASE/$PKG-OLD $BASE/$PKG-NEW
+ mv $BASE/$PKG $BASE/$PKG-OLD
+ mv $BASE/$PKG-NEW $BASE/$PKG
+}
+
+remove() {
+
+ if [ -d $BASE/$PKG-OLD ]; then
+ rm -rf $BASE/$PKG-OLD
+ fi
+
+ if [ ! -d $BASE/$PKG ]; then
+ finish $RED "Package '$PKG' not installed."
+ fi
+
+ # Make sure the package is stopped
+ service $PKG stop >/dev/null 2>&1
+
+ rm -rf $BASE/$PKG
+}
+
+show() {
+ local str="" pkgs pkg ver IFS
+
+ pkgs="$(find $BASE/* -type d -maxdepth 0 2>/dev/null)"
+ if [ -n "$pkgs" ]; then
+ unset IFS
+ for pkg in $pkgs; do
+ pkg="${pkg##*/}"
+ if [ -f $BASE/$pkg/.sha1 ]; then
+ ver="$(cat $BASE/$pkg/.sha1 | awk '{ print $2; exit; }')"
+ ver="${ver##*/}"
+ ver="${ver%.*}"
+ str="$str${str:+, }$pkg ($ver)"
+ else
+ str="$str${str:+, }$pkg (unknown)"
+ fi
+ done
+ fi
+
+ if [ -z "$str" ]; then
+ PKG_STR="No Packages Installed."
+ else
+ PKG_STR="Installed Packages: $str"
+ fi
+}
+
+finish() {
+
+ trap - INT TERM EXIT
+
+ if [ -d $BASE/dl ]; then
+ rm -rf $BASE/dl
+ fi
+
+ if [ -n "$2" ]; then
+ echo "$2"
+ fi
+ rm -f $LOCKFILE
+ exit $1
+}
+
+# main
+
+if mount | grep -q "/oldroot/mnt/asturw"; then
+ ASTURW="/oldroot/mnt/asturw"
+else
+ echo "Unable to find ASTURW partition."
+ exit $RED
+fi
+
+if [ -f $LOCKFILE ]; then
+ echo "Package Upgrade in Progress, please wait..."
+ exit $ORANGE
+fi
+touch $LOCKFILE
+
+trap 'finish 1 "Aborted"' INT TERM EXIT
+
+PKG="$1"
+
+case $PKG in
+
+fop2)
+ SRC_URL="http://files.astlinux.org/fop2-2.27-debian-i386.tgz"
+ ;;
+
+show)
+ show
+ finish $GREEN "$PKG_STR"
+ ;;
+
+*)
+ echo "Usage: upgrade-package show"
+ finish 1 "Usage: upgrade-package fop2 upgrade|revert|remove [ package_url ]"
+ ;;
+
+esac
+
+shift
+
+case $1 in
+
+upgrade)
+ if [ -n "$2" ]; then
+ SRC_URL=$2
+ fi
+ upgrade
+ finish $GREEN "Successful package '$PKG' upgrade, '$PKG' is not running."
+ ;;
+
+revert)
+ revert
+ finish $GREEN "Successful package '$PKG' revert to previous, '$PKG' is not running."
+ ;;
+
+remove)
+ remove
+ finish $GREEN "Successful package '$PKG' removal."
+ ;;
+
+*)
+ finish 1 "Usage: upgrade-package $PKG upgrade|revert|remove [ package_url ]"
+ ;;
+
+esac
+
Property changes on: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/toolchain/file_exclude
===================================================================
--- branches/1.0/toolchain/file_exclude 2013-07-07 22:25:22 UTC (rev 6129)
+++ branches/1.0/toolchain/file_exclude 2013-07-12 18:10:44 UTC (rev 6130)
@@ -3,3 +3,4 @@
dialog.tar.gz
oui.txt
bfdetect.tar.gz
+fop2-2.27-debian-i386.tgz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-07-13 20:21:36
|
Revision: 6133
http://sourceforge.net/p/astlinux/code/6133
Author: abelbeck
Date: 2013-07-13 20:21:34 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
fop2, add RAM check to disallow less than 512 MB systems, move to S98 runlevel
Modified Paths:
--------------
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/package/asterisk-fop2/fop2.init
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2013-07-13 14:09:46 UTC (rev 6132)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2013-07-13 20:21:34 UTC (rev 6133)
@@ -13,16 +13,16 @@
$(INSTALL) -D -m 0644 package/asterisk-fop2/config/fop2.cfg $(TARGET_DIR)/stat/etc/fop2/fop2.cfg
$(INSTALL) -D -m 0644 package/asterisk-fop2/config/buttons.cfg $(TARGET_DIR)/stat/etc/fop2/buttons.cfg
ln -snf /tmp/etc/fop2 $(TARGET_DIR)/etc/fop2
- ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/S82fop2
- ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/K00fop2
+ ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/S98fop2
+ ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/K00fop2
endef
define ASTERISK_FOP2_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/etc/init.d/fop2
rm -rf $(TARGET_DIR)/stat/etc/fop2
rm -f $(TARGET_DIR)/etc/fop2
- rm -f $(TARGET_DIR)/etc/runlevels/default/S82fop2
- rm -f $(TARGET_DIR)/etc/runlevels/default/K00fop2
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S98fop2
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K00fop2
endef
$(eval $(call GENTARGETS,package,asterisk-fop2))
Modified: branches/1.0/package/asterisk-fop2/fop2.init
===================================================================
--- branches/1.0/package/asterisk-fop2/fop2.init 2013-07-13 14:09:46 UTC (rev 6132)
+++ branches/1.0/package/asterisk-fop2/fop2.init 2013-07-13 20:21:34 UTC (rev 6133)
@@ -13,7 +13,11 @@
PIDFILE="/var/run/fop2.pid"
-TMPSIZEMAX=30000
+# fop2 uses Perl Archive (PAR) which generates many "/tmp/par-root/cache-" files
+# The value of TMPSIZEMAX should be 2x the normal par-root size (to allow for two different versions)
+# plus the standard 10 MB headroom. Removing the /tmp/par-root directory on a fop2 stop would
+# eliminate the 2x requirement, but would be bad practice if another PAR application was in use.
+TMPSIZEMAX=50000
init () {
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2013-07-13 14:09:46 UTC (rev 6132)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2013-07-13 20:21:34 UTC (rev 6133)
@@ -12,6 +12,16 @@
LOCKFILE="/var/lock/upgrade-package.lock"
#
+RAM_needed_MB() {
+ local MB="$1"
+
+ # Get amount of RAM in machine (in MB)
+ if [ $(awk '/^MemTotal:/ { print int($2 / 1024) }' /proc/meminfo) -lt $MB ]; then
+ return 1
+ fi
+ return 0
+}
+
upgrade() {
local suffix="${SRC_URL##*.}" tar_args pkg_dir err_str sha1
@@ -183,6 +193,9 @@
case $PKG in
fop2)
+ if ! RAM_needed_MB 475; then
+ finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
+ fi
SRC_URL="http://files.astlinux.org/fop2-2.27-debian-i386.tgz"
;;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-07-19 22:19:09
|
Revision: 6141
http://sourceforge.net/p/astlinux/code/6141
Author: abelbeck
Date: 2013-07-19 22:19:07 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
php, enable the 'zlib' module, only adds 5 KB to the image, which adds the required gzinflate() function FOP2 uses
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-07-19 18:31:20 UTC (rev 6140)
+++ branches/1.0/astlinux-ast11.config 2013-07-19 22:19:07 UTC (rev 6141)
@@ -458,7 +458,7 @@
BR2_PACKAGE_PHP_EXT_LIBXML2=y
BR2_PACKAGE_PHP_EXT_XMLPARSER=y
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
-# BR2_PACKAGE_PHP_EXT_ZLIB is not set
+BR2_PACKAGE_PHP_EXT_ZLIB=y
# BR2_PACKAGE_PHP_EXT_EXIF is not set
# BR2_PACKAGE_PHP_EXT_FTP is not set
# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-07-19 18:31:20 UTC (rev 6140)
+++ branches/1.0/astlinux.config 2013-07-19 22:19:07 UTC (rev 6141)
@@ -464,7 +464,7 @@
BR2_PACKAGE_PHP_EXT_LIBXML2=y
BR2_PACKAGE_PHP_EXT_XMLPARSER=y
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
-# BR2_PACKAGE_PHP_EXT_ZLIB is not set
+BR2_PACKAGE_PHP_EXT_ZLIB=y
# BR2_PACKAGE_PHP_EXT_EXIF is not set
# BR2_PACKAGE_PHP_EXT_FTP is not set
# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-07-19 18:31:20 UTC (rev 6140)
+++ branches/1.0/astlinux18.config 2013-07-19 22:19:07 UTC (rev 6141)
@@ -458,7 +458,7 @@
BR2_PACKAGE_PHP_EXT_LIBXML2=y
BR2_PACKAGE_PHP_EXT_XMLPARSER=y
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
-# BR2_PACKAGE_PHP_EXT_ZLIB is not set
+BR2_PACKAGE_PHP_EXT_ZLIB=y
# BR2_PACKAGE_PHP_EXT_EXIF is not set
# BR2_PACKAGE_PHP_EXT_FTP is not set
# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-08-06 12:58:47
|
Revision: 6165
http://sourceforge.net/p/astlinux/code/6165
Author: abelbeck
Date: 2013-08-06 12:58:43 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
logrotate, enable by default to manage non-syslog log files
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/logrotate/logrotate.conf
branches/1.0/package/logrotate/logrotate.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/astlinux-ast11.config 2013-08-06 12:58:43 UTC (rev 6165)
@@ -790,7 +790,7 @@
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_INOTIFY_TOOLS is not set
# BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
+BR2_PACKAGE_LOGROTATE=y
BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_SUDO=y
# BR2_PACKAGE_WHICH is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/astlinux.config 2013-08-06 12:58:43 UTC (rev 6165)
@@ -792,7 +792,7 @@
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_INOTIFY_TOOLS is not set
# BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
+BR2_PACKAGE_LOGROTATE=y
BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_SUDO=y
# BR2_PACKAGE_WHICH is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/astlinux18.config 2013-08-06 12:58:43 UTC (rev 6165)
@@ -790,7 +790,7 @@
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_INOTIFY_TOOLS is not set
# BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
+BR2_PACKAGE_LOGROTATE=y
BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_SUDO=y
# BR2_PACKAGE_WHICH is not set
Modified: branches/1.0/package/logrotate/logrotate.conf
===================================================================
--- branches/1.0/package/logrotate/logrotate.conf 2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/package/logrotate/logrotate.conf 2013-08-06 12:58:43 UTC (rev 6165)
@@ -1,14 +1,15 @@
-compress
-
+#
+# packages place log rotation information into this directory
include /etc/logrotate.d
-/var/log/messages /var/log/auth.log /var/log/user.log {
- rotate 7
- daily
- delaycompress
- missingok
- sharedscripts
- postrotate
- /usr/bin/killall -HUP syslogd
- endscript
+# don't compress by default
+nocompress
+
+# no packages own wtmp -- we'll rotate it here
+/var/log/wtmp {
+ missingok
+ size 100k
+ create 0644 root root
+ rotate 1
}
+
Modified: branches/1.0/package/logrotate/logrotate.mk
===================================================================
--- branches/1.0/package/logrotate/logrotate.mk 2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/package/logrotate/logrotate.mk 2013-08-06 12:58:43 UTC (rev 6165)
@@ -3,9 +3,9 @@
# logrotate
#
#############################################################
-LOGROTATE_VERSION = 3.7.9
+LOGROTATE_VERSION = 3.8.4
LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
-LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/
+LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate
LOGROTATE_DEPENDENCIES = popt
@@ -15,10 +15,10 @@
define LOGROTATE_INSTALL_TARGET_CMDS
$(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install
- if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then \
- $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf; \
+ $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
+ if [ ! -d $(TARGET_DIR)/etc/logrotate.d ]; then \
+ $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d; \
fi
- $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
endef
define LOGROTATE_UNINSTALL_TARGET_CMDS
@@ -26,7 +26,6 @@
rm -f $(TARGET_DIR)/etc/logrotate.conf
rm -f $(TARGET_DIR)/usr/man/man5/logrotate.conf.5
rm -f $(TARGET_DIR)/usr/man/man8/logrotate.8
- rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/logrotate.d
endef
define LOGROTATE_CLEAN_CMDS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-08-26 22:44:39
|
Revision: 6177
http://sourceforge.net/p/astlinux/code/6177
Author: abelbeck
Date: 2013-08-26 22:44:36 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
prosody, pubsub support, add new variables: XMPP_PUBSUB, XMPP_PUBSUB_ADMINS and XMPP_PUBSUB_AUTOCREATE
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-08-22 19:46:33 UTC (rev 6176)
+++ branches/1.0/package/prosody/prosody.init 2013-08-26 22:44:36 UTC (rev 6177)
@@ -154,8 +154,27 @@
if [ -n "$XMPP_CONFERENCE" ]; then
echo "Component \"$XMPP_CONFERENCE\" \"muc\""
+ echo ""
fi
+ if [ -n "$XMPP_PUBSUB" ]; then
+ echo "Component \"$XMPP_PUBSUB\" \"pubsub\""
+ if [ -n "$XMPP_PUBSUB_ADMINS" ]; then
+ admins=""
+ for m in $XMPP_PUBSUB_ADMINS; do
+ admins="$admins${admins:+, }\"$m\""
+ done
+ echo " admins = { $admins }"
+ fi
+ if [ "$XMPP_PUBSUB_AUTOCREATE" = "yes" -o "$XMPP_PUBSUB_AUTOCREATE" = "subscribe" ]; then
+ echo " autocreate_on_subscribe = true"
+ fi
+ if [ "$XMPP_PUBSUB_AUTOCREATE" = "yes" -o "$XMPP_PUBSUB_AUTOCREATE" = "publish" ]; then
+ echo " autocreate_on_publish = true"
+ fi
+ echo ""
+ fi
+
return 0
}
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-08-22 19:46:33 UTC (rev 6176)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-08-26 22:44:36 UTC (rev 6177)
@@ -454,7 +454,10 @@
#XMPP_ADMIN_USERS="" # Space separated list of accounts that are admins for the server.
#XMPP_ENABLE_MODULES="" # Space separated list of modules to enable, not enabled by default.
#XMPP_DISABLE_MODULES="" # Space separated list of default modules not to enable.
-#XMPP_CONFERENCE="" # Enable a multi-user chat room server, ie. conference.host.example.com
+#XMPP_CONFERENCE="" # Enable a multi-user chat room service, ie. conference.host.example.com
+#XMPP_PUBSUB="" # Enable a pubsub service, ie. pubsub.host.example.com
+#XMPP_PUBSUB_ADMINS="" # Space separated list of accounts that are admins for the pubsub service in addition to XMPP_ADMIN_USERS.
+#XMPP_PUBSUB_AUTOCREATE="" # Enable autocreate, "subscribe" only, "publish" only, "yes" both subscribe and publish, defaults to "no".
#XMPP_GROUPS="no" # Enable shared groups, "no", "yes", defaults to "no"
#XMPP_C2S_IDLE_TIMEOUT="300" # Send server-to-client ping every "nnn" seconds and timeout if no reply, disabled if ""
#XMPP_C2S_PORT="5222" # TCP Port for client-to-server connections, defaults to 5222
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-09-20 22:57:23
|
Revision: 6199
http://sourceforge.net/p/astlinux/code/6199
Author: abelbeck
Date: 2013-09-20 22:57:20 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
dynamicdns, add "ddclient" support along with the old "inadyn" client. DDCLIENT="ddclient" enables it.
Modified Paths:
--------------
branches/1.0/package/inadyn/inadyn.mk
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/inadyn/ddclient/
branches/1.0/package/inadyn/ddclient/ddclient.conf
branches/1.0/package/inadyn/ddclient/ddclient.pl
branches/1.0/package/inadyn/dynamicdns.init
Removed Paths:
-------------
branches/1.0/package/inadyn/inadyn.init
Added: branches/1.0/package/inadyn/ddclient/ddclient.conf
===================================================================
--- branches/1.0/package/inadyn/ddclient/ddclient.conf (rev 0)
+++ branches/1.0/package/inadyn/ddclient/ddclient.conf 2013-09-20 22:57:20 UTC (rev 6199)
@@ -0,0 +1,60 @@
+daemon=@DELAY@
+@USE_WEB@use=web, web=@WEB_STR@
+@USE_IF@use=if, if=@EXTIF@
+#@zoneedit@>
+#@zoneedit@>## ZoneEdit
+#@zoneedit@>server=dynamic.zoneedit.com
+#@zoneedit@>protocol=zoneedit1
+#@zoneedit@>login=@DDUSER@
+#@zoneedit@>password=@DDPASS@
+#@zoneedit@>@DDHOST@
+#@dyndns@>
+#@dyndns@>## dyndns.org dynamic addresses
+#@dyndns@>server=members.dyndns.org
+#@dyndns@>protocol=dyndns2
+#@dyndns@>login=@DDUSER@
+#@dyndns@>password=@DDPASS@
+#@dyndns@>@DDHOST@
+#@dyndns-static@>
+#@dyndns-static@>## dyndns.org static addresses
+#@dyndns-static@>server=members.dyndns.org
+#@dyndns-static@>protocol=dyndns2
+#@dyndns-static@>login=@DDUSER@
+#@dyndns-static@>password=@DDPASS@
+#@dyndns-static@>static=yes, @DDHOST@
+#@dyndns-custom@>
+#@dyndns-custom@>## dyndns.org custom addresses
+#@dyndns-custom@>server=members.dyndns.org
+#@dyndns-custom@>protocol=dyndns2
+#@dyndns-custom@>login=@DDUSER@
+#@dyndns-custom@>password=@DDPASS@
+#@dyndns-custom@>custom=yes, @DDHOST@
+#@no-ip@>
+#@no-ip@>## No-IP
+#@no-ip@>server=dynupdate.no-ip.com
+#@no-ip@>protocol=noip
+#@no-ip@>login=@DDUSER@
+#@no-ip@>password=@DDPASS@
+#@no-ip@>@DDHOST@
+#@freedns@>
+#@freedns@>## FreeDNS
+#@freedns@>server=freedns.afraid.org
+#@freedns@>protocol=freedns
+#@freedns@>login=@DDUSER@
+#@freedns@>password=@DDPASS@
+#@freedns@>@DDHOST@
+#@dnsomatic@>
+#@dnsomatic@>## DNS-O-MATIC
+#@dnsomatic@>server=updates.dnsomatic.com
+#@dnsomatic@>protocol=dyndns2
+#@dnsomatic@>login=@DDUSER@
+#@dnsomatic@>password=@DDPASS@
+#@dnsomatic@>@DDHOST@
+#@pairnic@>
+#@pairnic@>## pairNIC
+#@pairnic@>server=dynamic.pairnic.com
+#@pairnic@>protocol=dyndns2
+#@pairnic@>login=@DDUSER@
+#@pairnic@>password=@DDPASS@
+#@pairnic@>@DDHOST@
+
Added: branches/1.0/package/inadyn/ddclient/ddclient.pl
===================================================================
--- branches/1.0/package/inadyn/ddclient/ddclient.pl (rev 0)
+++ branches/1.0/package/inadyn/ddclient/ddclient.pl 2013-09-20 22:57:20 UTC (rev 6199)
@@ -0,0 +1,3765 @@
+#!/usr/bin/perl -w
+######################################################################
+# $Id: ddclient 153 2013-07-08 13:20:35Z wimpunk $
+#
+# DDCLIENT - a Perl client for updating DynDNS information
+#
+# Author: Paul Burry (pau...@bu...)
+# ddclient-developers: see https://sourceforge.net/project/memberlist.php?group_id=116817
+#
+# website: http://ddclient.sf.net
+#
+# Support for multiple IP numbers added by
+# Astaro AG, Ingo Schwarze <ischwarze-OOs/4mk...@pu...> September 16, 2008
+#
+######################################################################
+require 5.004;
+use strict;
+use Getopt::Long;
+use Sys::Hostname;
+use IO::Socket;
+
+my ($VERSION) = q$Revision: 153 $ =~ /(\d+)/;
+
+my $version = "3.8.0-r". $VERSION;
+my $programd = $0;
+$programd =~ s%^.*/%%;
+my $program = $programd;
+$program =~ s/d$//;
+my $now = time;
+my $hostname = hostname();
+my $etc = ($program =~ /test/i) ? './' : '/etc/ddclient/';
+my $cachedir = ($program =~ /test/i) ? './' : '/var/cache/ddclient/';
+my $savedir = ($program =~ /test/i) ? 'URL/' : '/tmp/';
+my $msgs = '';
+my $last_msgs = '';
+
+use vars qw($file $lineno);
+local $file = '';
+local $lineno = '';
+
+$ENV{'PATH'} = (exists($ENV{PATH}) ? "$ENV{PATH}:" : "") . "/sbin:/usr/sbin:/bin:/usr/bin:/etc:/usr/lib:";
+
+sub T_ANY {'any'};
+sub T_STRING {'string'};
+sub T_EMAIL {'e-mail address'};
+sub T_NUMBER {'number'};
+sub T_DELAY {'time delay (ie. 1d, 1hour, 1m)'};
+sub T_LOGIN {'login'};
+sub T_PASSWD {'password'};
+sub T_BOOL {'boolean value'};
+sub T_FQDN {'fully qualified host name'};
+sub T_OFQDN {'optional fully qualified host name'};
+sub T_FILE {'file name'};
+sub T_FQDNP {'fully qualified host name and optional port number'};
+sub T_PROTO {'protocol'}
+sub T_USE {'ip strategy'}
+sub T_IF {'interface'}
+sub T_PROG {'program name'}
+sub T_IP {'ip'}
+sub T_POSTS {'postscript'};
+
+## strategies for obtaining an ip address.
+my %builtinweb = (
+ 'dyndns' => { 'url' => 'http://checkip.dyndns.org/', 'skip' =>
+ 'Current IP Address:', },
+ 'dnspark' => { 'url' => 'http://ipdetect.dnspark.com/', 'skip' => 'Current Address:', },
+ 'loopia' => { 'url' => 'http://dns.loopia.se/checkip/checkip.php', 'skip' => 'Current Address:', },
+);
+my %builtinfw = (
+ 'watchguard-soho' => {
+ 'name' => 'Watchguard SOHO FW',
+ 'url' => '/pubnet.htm',
+ 'skip' => 'NAME=IPAddress VALUE=',
+ },
+ 'netopia-r910' => {
+ 'name' => 'Netopia R910 FW',
+ 'url' => '/WanEvtLog',
+ 'skip' => 'local:',
+ },
+ 'smc-barricade' => {
+ 'name' => 'SMC Barricade FW',
+ 'url' => '/status.htm',
+ 'skip' => 'IP Address',
+ },
+ 'smc-barricade-alt' => {
+ 'name' => 'SMC Barricade FW (alternate config)',
+ 'url' => '/status.HTM',
+ 'skip' => 'WAN IP',
+ },
+ 'smc-barricade-7401bra' => {
+ 'name' => 'SMC Barricade 7401BRA FW',
+ 'url' => '/admin/wan1.htm',
+ 'skip' => 'IP Address',
+ },
+ 'netgear-rt3xx' => {
+ 'name' => 'Netgear FW',
+ 'url' => '/mtenSysStatus.html',
+ 'skip' => 'IP Address',
+ },
+ 'elsa-lancom-dsl10' => {
+ 'name' => 'ELSA LanCom DSL/10 DSL FW',
+ 'url' => '/config/1/6/8/3/',
+ 'skip' => 'IP.Address',
+ },
+ 'elsa-lancom-dsl10-ch01' => {
+ 'name' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)',
+ 'url' => '/config/1/6/8/3/',
+ 'skip' => 'IP.Address.*?CH01',
+ },
+ 'elsa-lancom-dsl10-ch02' => {
+ 'name' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)',
+ 'url' => '/config/1/6/8/3/',
+ 'skip' => 'IP.Address.*?CH02',
+ },
+ 'linksys' => {
+ 'name' => 'Linksys FW',
+ 'url' => '/Status.htm',
+ 'skip' => 'WAN.*?Address',
+ },
+ 'linksys-ver2' => {
+ 'name' => 'Linksys FW version 2',
+ 'url' => '/RouterStatus.htm',
+ 'skip' => 'WAN.*?Address',
+ },
+ 'linksys-ver3' => {
+ 'name' => 'Linksys FW version 3',
+ 'url' => '/Status_Router.htm',
+ 'skip' => 'WAN.*?Address',
+ },
+ 'linksys-wrt854g' => {
+ 'name' => 'Linksys WRT854G FW',
+ 'url' => '/Status_Router.asp',
+ 'skip' => 'IP Address:',
+ },
+ 'maxgate-ugate3x00' => {
+ 'name' => 'MaxGate UGATE-3x00 FW',
+ 'url' => '/Status.htm',
+ 'skip' => 'WAN.*?IP Address',
+ },
+ 'netcomm-nb3' => {
+ 'name' => 'NetComm NB3',
+ 'url' => '/MainPage?id=6',
+ 'skip' => 'ppp-0',
+ },
+ '3com-3c886a' => {
+ 'name' => '3com 3c886a 56k Lan Modem',
+ 'url' => '/stat3.htm',
+ 'skip' => 'IP address in use',
+ },
+ 'sohoware-nbg800' => {
+ 'name' => 'SOHOWare BroadGuard NBG800',
+ 'url' => '/status.htm',
+ 'skip' => 'Internet IP',
+ },
+ 'xsense-aero' => {
+ 'name' => 'Xsense Aero',
+ 'url' => '/A_SysInfo.htm',
+ 'skip' => 'WAN.*?IP Address',
+ },
+ 'alcatel-stp' => {
+ 'name' => 'Alcatel Speed Touch Pro',
+ 'url' => '/cgi/router/',
+ 'skip' => 'Brt',
+ },
+ 'alcatel-510' => {
+ 'name' => 'Alcatel Speed Touch 510',
+ 'url' => '/cgi/ip/',
+ 'skip' => 'ppp',
+ },
+ 'allnet-1298' => {
+ 'name' => 'Allnet 1298',
+ 'url' => '/cgi/router/',
+ 'skip' => 'WAN',
+ },
+ '3com-oc-remote812' => {
+ 'name' => '3com OfficeConnect Remote 812',
+ 'url' => '/callEvent',
+ 'skip' => '.*LOCAL',
+ },
+ 'e-tech' => {
+ 'name' => 'E-tech Router',
+ 'url' => '/Status.htm',
+ 'skip' => 'Public IP Address',
+ },
+ 'cayman-3220h' => {
+ 'name' => 'Cayman 3220-H DSL',
+ 'url' => '/shell/show+ip+interfaces',
+ 'skip' => '.*inet',
+ },
+ 'vigor-2200usb' => {
+ 'name' => 'Vigor 2200 USB',
+ 'url' => '/doc/online.sht',
+ 'skip' => 'PPPoA',
+ },
+ 'dlink-614' => {
+ 'name' => 'D-Link DI-614+',
+ 'url' => '/st_devic.html',
+ 'skip' => 'WAN',
+ },
+ 'dlink-604' => {
+ 'name' => 'D-Link DI-604',
+ 'url' => '/st_devic.html',
+ 'skip' => 'WAN.*?IP.*Address',
+ },
+ 'olitec-SX200' => {
+ 'name' => 'olitec-SX200',
+ 'url' => '/doc/wan.htm',
+ 'skip' => 'st_wan_ip[0] = "',
+ },
+ 'westell-6100' => {
+ 'name' => 'Westell C90-610015-06 DSL Router',
+ 'url' => '/advstat.htm',
+ 'skip' => 'IP.+?Address',
+ },
+ '2wire' => {
+ 'name' => '2Wire 1701HG Gateway',
+ 'url' => '/xslt?PAGE=B01',
+ 'skip' => 'Internet Address:',
+ },
+ 'linksys-rv042-wan1' => {
+ 'name' => 'Linksys RV042 Dual Homed Router WAN Port 2',
+ 'url' => '/home.htm',
+ 'skip' => 'WAN1 IP',
+ },
+ 'linksys-rv042-wan2' => {
+ 'name' => 'Linksys RV042 Dual Homed Router WAN Port 2',
+ 'url' => '/home.htm',
+ 'skip' => 'WAN2 IP',
+ },
+ 'netgear-rp614' => {
+ 'name' => 'Netgear RP614 FW',
+ 'url' => '/sysstatus.html',
+ 'skip' => 'IP Address',
+ },
+ 'watchguard-edge-x' => {
+ 'name' => 'Watchguard Edge X FW',
+ 'url' => '/netstat.htm',
+ 'skip' => 'inet addr:',
+ },
+ 'dlink-524' => {
+ 'name' => 'D-Link DI-524',
+ 'url' => '/st_device.html',
+ 'skip' => 'WAN.*?Addres',
+ },
+ 'rtp300' => {
+ 'name' => 'Linksys RTP300',
+ 'url' => '/cgi-bin/webcm?getpage=%2Fusr%2Fwww_safe%2Fhtml%2Fstatus%2FRouter.html',
+ 'skip' => 'Internet.*?IP Address',
+ },
+ 'netgear-wpn824' => {
+ 'name' => 'Netgear WPN824 FW',
+ 'url' => '/RST_status.htm',
+ 'skip' => 'IP Address',
+ },
+ 'linksys-wcg200' => {
+ 'name' => 'Linksys WCG200 FW',
+ 'url' => '/RgStatus.asp',
+ 'skip' => 'WAN.IP.*?Address',
+ },
+ 'netgear-dg834g' => {
+ 'name' => 'netgear-dg834g',
+ 'url' => '/setup.cgi?next_file=s_status.htm&todo=cfg_init',
+ 'skip' => '',
+ },
+ 'netgear-wgt624' => {
+ 'name' => 'Netgear WGT624',
+ 'url' => '/RST_st_dhcp.htm',
+ 'skip' => 'IP Address</B></td><TD NOWRAP width="50%">',
+ },
+ 'sveasoft' => {
+ 'name' => 'Sveasoft WRT54G/WRT54GS',
+ 'url' => '/Status_Router.asp',
+ 'skip' => 'var wan_ip',
+ },
+ 'smc-barricade-7004vbr' => {
+ 'name' => 'SMC Barricade FW (7004VBR model config)',
+ 'url' => '/status_main.stm',
+ 'skip' => 'var wan_ip=',
+ },
+ 'sitecom-dc202' => {
+ 'name' => 'Sitecom DC-202 FW',
+ 'url' => '/status.htm',
+ 'skip' => 'Internet IP Address',
+ },
+);
+my %ip_strategies = (
+ 'ip' => ": obtain IP from -ip {address}",
+ 'web' => ": obtain IP from an IP discovery page on the web",
+ 'fw' => ": obtain IP from the firewall specified by -fw {type|address}",
+ 'if' => ": obtain IP from the -if {interface}",
+ 'cmd' => ": obtain IP from the -cmd {external-command}",
+ 'cisco' => ": obtain IP from Cisco FW at the -fw {address}",
+ 'cisco-asa' => ": obtain IP from Cisco ASA at the -fw {address}",
+ map { $_ => sprintf ": obtain IP from %s at the -fw {address}", $builtinfw{$_}->{'name'} } keys %builtinfw,
+);
+sub ip_strategies_usage {
+ return map { sprintf(" -use=%-22s %s.", $_, $ip_strategies{$_}) } sort keys %ip_strategies;
+}
+
+my %web_strategies = (
+ 'dyndns'=> 1,
+ 'dnspark'=> 1,
+ 'loopia'=> 1,
+);
+
+sub setv {
+ return {
+ 'type' => shift,
+ 'required' => shift,
+ 'cache' => shift,
+ 'config' => shift,
+ 'default' => shift,
+ 'minimum' => shift,
+ };
+};
+my %variables = (
+ 'global-defaults' => {
+ 'daemon' => setv(T_DELAY, 0, 0, 1, 0, interval('60s')),
+ 'foreground' => setv(T_BOOL, 0, 0, 1, 0, undef),
+ 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef),
+ 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef),
+ 'pid' => setv(T_FILE, 0, 0, 1, "", undef),
+ 'proxy' => setv(T_FQDNP, 0, 0, 1, '', undef),
+ 'protocol' => setv(T_PROTO, 0, 0, 1, 'dyndns2', undef),
+
+ 'use' => setv(T_USE, 0, 0, 1, 'ip', undef),
+ 'ip' => setv(T_IP, 0, 0, 1, undef, undef),
+ 'if' => setv(T_IF, 0, 0, 1, 'ppp0', undef),
+ 'if-skip' => setv(T_STRING,1, 0, 1, '', undef),
+ 'web' => setv(T_STRING,0, 0, 1, 'dyndns', undef),
+ 'web-skip' => setv(T_STRING,1, 0, 1, '', undef),
+ 'fw' => setv(T_ANY, 0, 0, 1, '', undef),
+ 'fw-skip' => setv(T_STRING,1, 0, 1, '', undef),
+ 'fw-login' => setv(T_LOGIN, 1, 0, 1, '', undef),
+ 'fw-password' => setv(T_PASSWD,1, 0, 1, '', undef),
+ 'cmd' => setv(T_PROG, 0, 0, 1, '', undef),
+ 'cmd-skip' => setv(T_STRING,1, 0, 1, '', undef),
+
+ 'timeout' => setv(T_DELAY, 0, 0, 1, interval('120s'), interval('120s')),
+ 'retry' => setv(T_BOOL, 0, 0, 0, 0, undef),
+ 'force' => setv(T_BOOL, 0, 0, 0, 0, undef),
+ 'ssl' => setv(T_BOOL, 0, 0, 0, 0, undef),
+
+ 'syslog' => setv(T_BOOL, 0, 0, 1, 0, undef),
+ 'facility' => setv(T_STRING,0, 0, 1, 'daemon', undef),
+ 'priority' => setv(T_STRING,0, 0, 1, 'notice', undef),
+ 'mail' => setv(T_EMAIL, 0, 0, 1, '', undef),
+ 'mail-failure' => setv(T_EMAIL, 0, 0, 1, '', undef),
+
+ 'exec' => setv(T_BOOL, 0, 0, 1, 1, undef),
+ 'debug' => setv(T_BOOL, 0, 0, 1, 0, undef),
+ 'verbose' => setv(T_BOOL, 0, 0, 1, 0, undef),
+ 'quiet' => setv(T_BOOL, 0, 0, 1, 0, undef),
+ 'help' => setv(T_BOOL, 0, 0, 1, 0, undef),
+ 'test' => setv(T_BOOL, 0, 0, 1, 0, undef),
+ 'geturl' => setv(T_STRING,0, 0, 0, '', undef),
+
+ 'postscript' => setv(T_POSTS, 0, 0, 1, '', undef),
+ },
+ 'service-common-defaults' => {
+ 'server' => setv(T_FQDNP, 1, 0, 1, 'members.dyndns.org', undef),
+ 'login' => setv(T_LOGIN, 1, 0, 1, '', undef),
+ 'password' => setv(T_PASSWD, 1, 0, 1, '', undef),
+ 'host' => setv(T_STRING, 1, 1, 1, '', undef),
+
+ 'use' => setv(T_USE, 0, 0, 1, 'ip', undef),
+ 'if' => setv(T_IF, 0, 0, 1, 'ppp0', undef),
+ 'if-skip' => setv(T_STRING,0, 0, 1, '', undef),
+ 'web' => setv(T_STRING,0, 0, 1, 'dyndns', undef),
+ 'web-skip' => setv(T_STRING,0, 0, 1, '', undef),
+ 'fw' => setv(T_ANY, 0, 0, 1, '', undef),
+ 'fw-skip' => setv(T_STRING,0, 0, 1, '', undef),
+ 'fw-login' => setv(T_LOGIN, 0, 0, 1, '', undef),
+ 'fw-password' => setv(T_PASSWD,0, 0, 1, '', undef),
+ 'cmd' => setv(T_PROG, 0, 0, 1, '', undef),
+ 'cmd-skip' => setv(T_STRING,0, 0, 1, '', undef),
+
+ 'ip' => setv(T_IP, 0, 1, 0, undef, undef),
+ 'wtime' => setv(T_DELAY, 0, 1, 1, 0, interval('30s')),
+ 'mtime' => setv(T_NUMBER, 0, 1, 0, 0, undef),
+ 'atime' => setv(T_NUMBER, 0, 1, 0, 0, undef),
+ 'status' => setv(T_ANY, 0, 1, 0, '', undef),
+ 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('30s'), 0),
+ 'max-interval' => setv(T_DELAY, 0, 0, 1, interval('25d'), 0),
+ 'min-error-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),
+
+ 'warned-min-interval' => setv(T_ANY, 0, 1, 0, 0, undef),
+ 'warned-min-error-interval' => setv(T_ANY, 0, 1, 0, 0, undef),
+ },
+ 'dyndns-common-defaults' => {
+ 'static' => setv(T_BOOL, 0, 1, 1, 0, undef),
+ 'wildcard' => setv(T_BOOL, 0, 1, 1, 0, undef),
+ 'mx' => setv(T_OFQDN, 0, 1, 1, '', undef),
+ 'backupmx' => setv(T_BOOL, 0, 1, 1, 0, undef),
+ },
+ 'easydns-common-defaults' => {
+ 'wildcard' => setv(T_BOOL, 0, 1, 1, 0, undef),
+ 'mx' => setv(T_OFQDN, 0, 1, 1, '', undef),
+ 'backupmx' => setv(T_BOOL, 0, 1, 1, 0, undef),
+ },
+ 'dnspark-common-defaults' => {
+ 'mx' => setv(T_OFQDN, 0, 1, 1, '', undef),
+ 'mxpri' => setv(T_NUMBER, 0, 0, 1, 5, undef),
+ },
+ 'noip-common-defaults' => {
+ 'static' => setv(T_BOOL, 0, 1, 1, 0, undef),
+ },
+ 'noip-service-common-defaults' => {
+ 'server' => setv(T_FQDNP, 1, 0, 1, 'dynupdate.no-ip.com', undef),
+ 'login' => setv(T_LOGIN, 1, 0, 1, '', undef),
+ 'password' => setv(T_PASSWD, 1, 0, 1, '', undef),
+ 'host' => setv(T_STRING, 1, 1, 1, '', undef),
+ 'ip' => setv(T_IP, 0, 1, 0, undef, undef),
+ 'wtime' => setv(T_DELAY, 0, 1, 1, 0, interval('30s')),
+ 'mtime' => setv(T_NUMBER, 0, 1, 0, 0, undef),
+ 'atime' => setv(T_NUMBER, 0, 1, 0, 0, undef),
+ 'status' => setv(T_ANY, 0, 1, 0, '', undef),
+ 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('30s'), 0),
+ 'max-interval' => setv(T_DELAY, 0, 0, 1, interval('25d'), 0),
+ 'min-error-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),
+ 'warned-min-interval' => setv(T_ANY, 0, 1, 0, 0, undef),
+ 'warned-min-error-interval' => setv(T_ANY, 0, 1, 0, 0, undef),
+ },
+ 'zoneedit-service-common-defaults' => {
+ 'zone' => setv(T_OFQDN, 0, 0, 1, undef, undef),
+ },
+ 'dtdns-common-defaults' => {
+ 'login' => setv(T_LOGIN, 0, 0, 0, 'unused', undef),
+ 'client' => setv(T_STRING, 0, 1, 1, $program, undef),
+ },
+);
+my %services = (
+ 'dyndns1' => {
+ 'updateable' => \&nic_dyndns2_updateable,
+ 'update' => \&nic_dyndns1_update,
+ 'examples' => \&nic_dyndns1_examples,
+ 'variables' => merge(
+ $variables{'dyndns-common-defaults'},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'dyndns2' => {
+ 'updateable' => \&nic_dyndns2_updateable,
+ 'update' => \&nic_dyndns2_update,
+ 'examples' => \&nic_dyndns2_examples,
+ 'variables' => merge(
+ { 'custom' => setv(T_BOOL, 0, 1, 1, 0, undef), },
+ { 'script' => setv(T_STRING, 1, 1, 1, '/nic/update', undef), },
+# { 'offline' => setv(T_BOOL, 0, 1, 1, 0, undef), },
+ $variables{'dyndns-common-defaults'},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'noip' => {
+ 'updateable' => undef,
+ 'update' => \&nic_noip_update,
+ 'examples' => \&nic_noip_examples,
+ 'variables' => merge(
+ { 'custom' => setv(T_BOOL, 0, 1, 1, 0, undef), },
+ $variables{'noip-common-defaults'},
+ $variables{'noip-service-common-defaults'},
+ ),
+ },
+ 'concont' => {
+ 'updateable' => undef,
+ 'update' => \&nic_concont_update,
+ 'examples' => \&nic_concont_examples,
+ 'variables' => merge(
+ $variables{'service-common-defaults'},
+ { 'mx' => setv(T_OFQDN, 0, 1, 1, '', undef), },
+ { 'wildcard' => setv(T_BOOL, 0, 1, 1, 0, undef), },
+ ),
+ },
+ 'dslreports1' => {
+ 'updateable' => undef,
+ 'update' => \&nic_dslreports1_update,
+ 'examples' => \&nic_dslreports1_examples,
+ 'variables' => merge(
+ { 'host' => setv(T_NUMBER, 1, 1, 1, 0, undef) },
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'hammernode1' => {
+ 'updateable' => undef,
+ 'update' => \&nic_hammernode1_update,
+ 'examples' => \&nic_hammernode1_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'dup.hn.org', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'zoneedit1' => {
+ 'updateable' => undef,
+ 'update' => \&nic_zoneedit1_update,
+ 'examples' => \&nic_zoneedit1_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'dynamic.zoneedit.com', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),},
+ $variables{'service-common-defaults'},
+ $variables{'zoneedit-service-common-defaults'},
+ ),
+ },
+ 'easydns' => {
+ 'updateable' => undef,
+ 'update' => \&nic_easydns_update,
+ 'examples' => \&nic_easydns_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'members.easydns.com', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),},
+ $variables{'easydns-common-defaults'},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'dnspark' => {
+ 'updateable' => undef,
+ 'update' => \&nic_dnspark_update,
+ 'examples' => \&nic_dnspark_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'www.dnspark.com', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),},
+ $variables{'dnspark-common-defaults'},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'namecheap' => {
+ 'updateable' => undef,
+ 'update' => \&nic_namecheap_update,
+ 'examples' => \&nic_namecheap_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'dynamicdns.park-your-domain.com', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, 0, interval('5m')),},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'sitelutions' => {
+ 'updateable' => undef,
+ 'update' => \&nic_sitelutions_update,
+ 'examples' => \&nic_sitelutions_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'www.sitelutions.com', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, 0, interval('5m')),},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'freedns' => {
+ 'updateable' => undef,
+ 'update' => \&nic_freedns_update,
+ 'examples' => \&nic_freedns_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'freedns.afraid.org', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, 0, interval('5m')),},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'changeip' => {
+ 'updateable' => undef,
+ 'update' => \&nic_changeip_update,
+ 'examples' => \&nic_changeip_examples,
+ 'variables' => merge(
+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'nic.changeip.com', undef) },
+ { 'min-interval' => setv(T_DELAY, 0, 0, 1, 0, interval('5m')),},
+ $variables{'service-common-defaults'},
+ ),
+ },
+ 'dtdns' => {
+ 'updateable' => undef,
+ 'update' => \&nic_dtdns_update,
+ 'examples' => \&nic_dtdns_examples,
+ 'variables' => merge(
+ $variables{'dtdns-common-defaults'},
+ $variables{'service-common-defaults'},
+ ),
+ },
+);
+$variables{'merged'} = merge($variables{'global-defaults'},
+ $variables{'service-common-defaults'},
+ $variables{'dyndns-common-defaults'},
+ map { $services{$_}{'variables'} } keys %services,
+);
+
+my @opt = (
+ "usage: ${program} [options]",
+ "options are:",
+ [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ],
++ [ "foreground", "!", "-foreground : do not fork" ],
+ [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ],
+ [ "server", "=s", "-server host : update DNS information on 'host'" ],
+ [ "protocol", "=s", "-protocol type : update protocol used" ],
+ [ "file", "=s", "-file path : load configuration information from 'path'" ],
+ [ "cache", "=s", "-cache path : record address used in 'path'" ],
+ [ "pid", "=s", "-pid path : record process id in 'path'" ],
+ "",
+ [ "use", "=s", "-use which : how the should IP address be obtained." ],
+ &ip_strategies_usage(),
+ "",
+ [ "ip", "=s", "-ip address : set the IP address to 'address'" ],
+ "",
+ [ "if", "=s", "-if interface : obtain IP address from 'interface'" ],
+ [ "if-skip", "=s", "-if-skip pattern : skip any IP addresses before 'pattern' in the output of ifconfig {if}" ],
+ "",
+ [ "web", "=s", "-web provider|url : obtain IP address from provider's IP checking page" ],
+ [ "web-skip", "=s", "-web-skip pattern : skip any IP addresses before 'pattern' on the web provider|url" ],
+ "",
+ [ "fw", "=s", "-fw address|url : obtain IP address from firewall at 'address'" ],
+ [ "fw-skip", "=s", "-fw-skip pattern : skip any IP addresses before 'pattern' on the firewall address|url" ],
+ [ "fw-login", "=s", "-fw-login login : use 'login' when getting IP from fw" ],
+ [ "fw-password", "=s", "-fw-password secret : use password 'secret' when getting IP from fw" ],
+ "",
+ [ "cmd", "=s", "-cmd program : obtain IP address from by calling {program}" ],
+ [ "cmd-skip", "=s", "-cmd-skip pattern : skip any IP addresses before 'pattern' in the output of {cmd}" ],
+ "",
+ [ "login", "=s", "-login user : login as 'user'" ],
+ [ "password", "=s", "-password secret : use password 'secret'" ],
+ [ "host", "=s", "-host host : update DNS information for 'host'" ],
+ "",
+ [ "options", "=s", "-options opt,opt : optional per-service arguments (see below)" ],
+ "",
+ [ "ssl", "!", "-{no}ssl : do updates over encrypted SSL connection" ],
+ [ "retry", "!", "-{no}retry : ...
[truncated message content] |
|
From: <abe...@us...> - 2013-10-02 19:21:38
|
Revision: 6212
http://sourceforge.net/p/astlinux/code/6212
Author: abelbeck
Date: 2013-10-02 19:21:33 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
slapd LDAP server, initial check-in, not enabled in default configs, runtime enable with LDAP_SERVER=yes
The goal is to setup an ODBC SQL(ite3) LDAP backend to the file /mnt/kd/ldap-odbc.sqlite3 which could store an address book that can be distributed via LDAP to IP Phones, mail app contacts, etc. and additionally be used within Asterisk using func_odbc. Far more configuration and testing is required to prove this is useful. Also openldap debug is enabled for now on a temp basis.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/openldap/Config.in
branches/1.0/package/openldap/openldap.mk
branches/1.0/package/unixodbc/unixodbc.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/openldap/slapd.init
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-09-30 19:43:00 UTC (rev 6211)
+++ branches/1.0/astlinux-ast11.config 2013-10-02 19:21:33 UTC (rev 6212)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6129-dirty Configuration
-# Fri Jul 12 11:14:34 2013
+# Buildroot 2011.08-svn6211-dirty Configuration
+# Mon Sep 30 15:22:34 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -737,6 +737,7 @@
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
+# BR2_PACKAGE_OPENLDAP_SERVER is not set
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-09-30 19:43:00 UTC (rev 6211)
+++ branches/1.0/astlinux.config 2013-10-02 19:21:33 UTC (rev 6212)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6129-dirty Configuration
-# Fri Jul 12 11:14:23 2013
+# Buildroot 2011.08-svn6211-dirty Configuration
+# Mon Sep 30 15:22:26 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -739,6 +739,7 @@
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
+# BR2_PACKAGE_OPENLDAP_SERVER is not set
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-09-30 19:43:00 UTC (rev 6211)
+++ branches/1.0/astlinux18.config 2013-10-02 19:21:33 UTC (rev 6212)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6129-dirty Configuration
-# Fri Jul 12 11:14:30 2013
+# Buildroot 2011.08-svn6211-dirty Configuration
+# Mon Sep 30 15:22:28 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -737,6 +737,7 @@
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
+# BR2_PACKAGE_OPENLDAP_SERVER is not set
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/package/openldap/Config.in
===================================================================
--- branches/1.0/package/openldap/Config.in 2013-09-30 19:43:00 UTC (rev 6211)
+++ branches/1.0/package/openldap/Config.in 2013-10-02 19:21:33 UTC (rev 6212)
@@ -6,8 +6,16 @@
Lightweight Directory Access Protocol.
The suite includes:
- - slapd: stand-alone LDAP daemon (server) DISABLED
+ - slapd: stand-alone LDAP daemon (optional server)
- libraries: implementing the LDAP protocol
- utilities, tools, and sample clients (ex. ldapsearch)
http://www.openldap.org/
+
+config BR2_PACKAGE_OPENLDAP_SERVER
+ bool "openldap-server"
+ default n
+ depends on BR2_PACKAGE_OPENLDAP
+ help
+ Include slapd and server related files.
+
Modified: branches/1.0/package/openldap/openldap.mk
===================================================================
--- branches/1.0/package/openldap/openldap.mk 2013-09-30 19:43:00 UTC (rev 6211)
+++ branches/1.0/package/openldap/openldap.mk 2013-10-02 19:21:33 UTC (rev 6212)
@@ -15,20 +15,35 @@
OPENLDAP_CONF_OPT = \
--enable-shared \
--disable-static \
- --disable-debug \
+ --enable-debug \
--enable-syslog \
--enable-ipv6 \
--with-tls \
- --with-yielding_select="yes" \
+ --with-odbc=unixodbc \
+ --with-yielding_select=yes \
--without-fetch \
--without-cyrus-sasl \
- --disable-slapd \
+ --enable-slapd \
+ --enable-sql \
+ --enable-null \
--disable-local \
--disable-bdb \
--disable-hdb \
--disable-monitor \
--disable-relay
+ifeq ($(BR2_PACKAGE_OPENLDAP_SERVER),y)
+define OPENLDAP_INSTALL_TARGET_SERVER
+ cp -a $(STAGING_DIR)/etc/openldap/schema $(TARGET_DIR)/etc/openldap/
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/libexec/slapd $(TARGET_DIR)/usr/sbin/
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/bin/ldap* $(TARGET_DIR)/usr/bin/
+ $(INSTALL) -m 0755 -D package/openldap/slapd.init $(TARGET_DIR)/etc/init.d/slapd
+ ln -sf /tmp/etc/openldap/slapd.conf $(TARGET_DIR)/etc/openldap/slapd.conf
+ ln -sf ../../init.d/slapd $(TARGET_DIR)/etc/runlevels/default/S45slapd
+ ln -sf ../../init.d/slapd $(TARGET_DIR)/etc/runlevels/default/K16slapd
+endef
+endif
+
define OPENLDAP_INSTALL_TARGET_CMDS
cp -a $(STAGING_DIR)/usr/lib/libldap*.so* $(TARGET_DIR)/usr/lib/
cp -a $(STAGING_DIR)/usr/lib/liblber*.so* $(TARGET_DIR)/usr/lib/
@@ -38,16 +53,20 @@
mkdir -p $(TARGET_DIR)/etc/openldap
ln -sf /tmp/etc/openldap/ldap.conf $(TARGET_DIR)/etc/openldap/ldap.conf
ln -sf ../../init.d/ldap $(TARGET_DIR)/etc/runlevels/default/S00ldap
+ $(OPENLDAP_INSTALL_TARGET_SERVER)
endef
define OPENLDAP_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/lib/libldap*
rm -f $(TARGET_DIR)/usr/lib/liblber*
- rm -f $(TARGET_DIR)/usr/bin/ldapsearch
- rm -f $(TARGET_DIR)/usr/bin/ldapwhoami
+ rm -f $(TARGET_DIR)/usr/bin/ldap*
rm -f $(TARGET_DIR)/etc/init.d/ldap
+ rm -f $(TARGET_DIR)/etc/init.d/slapd
rm -rf $(TARGET_DIR)/etc/openldap
rm -f $(TARGET_DIR)/etc/runlevels/default/S00ldap
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S45slapd
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K16slapd
+ rm -f $(TARGET_DIR)/usr/sbin/slapd
endef
$(eval $(call AUTOTARGETS,package,openldap))
Added: branches/1.0/package/openldap/slapd.init
===================================================================
--- branches/1.0/package/openldap/slapd.init (rev 0)
+++ branches/1.0/package/openldap/slapd.init 2013-10-02 19:21:33 UTC (rev 6212)
@@ -0,0 +1,154 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+gen_sqlite3_schema()
+{
+
+ sqlite3 -batch /mnt/kd/ldap-odbc.sqlite3 <<EOF
+CREATE TABLE 'ldap_oc_mappings' (
+ 'id' INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ 'name' TEXT NOT NULL,
+ 'keytbl' TEXT NOT NULL,
+ 'keycol' TEXT NOT NULL,
+ 'create_proc' TEXT,
+ 'delete_proc' TEXT,
+ 'expect_return' INTEGER NOT NULL
+);
+
+CREATE TABLE 'ldap_attr_mappings' (
+ 'id' INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ 'oc_map_id' INTEGER NOT NULL REFERENCES ldap_oc_mappings('id'),
+ 'name' TEXT NOT NULL,
+ 'sel_expr' TEXT NOT NULL,
+ 'sel_expr_u' TEXT,
+ 'from_tbls' TEXT NOT NULL,
+ 'join_where' TEXT,
+ 'add_proc' TEXT,
+ 'delete_proc' TEXT,
+ 'param_order' INTEGER NOT NULL,
+ 'expect_return' INTEGER NOT NULL
+);
+
+CREATE TABLE 'ldap_entries' (
+ 'id' INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ 'dn' TEXT UNIQUE NOT NULL,
+ 'oc_map_id' INTEGER UNIQUE NOT NULL REFERENCES ldap_oc_mappings('id'),
+ 'parent' INTEGER NOT NULL,
+ 'keyval' INTEGER UNIQUE NOT NULL
+);
+
+CREATE TABLE 'ldap_entry_objclasses' (
+ 'entry_id' INTEGER NOT NULL REFERENCES ldap_entries('id'),
+ 'oc_name' TEXT
+);
+
+EOF
+}
+
+gen_slapd_conf()
+{
+
+ echo "include /etc/openldap/schema/core.schema
+include /etc/openldap/schema/cosine.schema
+include /etc/openldap/schema/inetorgperson.schema
+
+pidfile /var/run/slapd.pid
+argsfile /var/run/slapd.args
+
+database sql
+#suffix \"o=sql,c=RU\"
+#rootdn \"cn=root,o=sql,c=RU\"
+suffix \"dc=example,dc=com\"
+rootdn \"cn=root,dc=example,dc=com\"
+rootpw astlinux
+dbname ldap
+dbuser unused
+dbpasswd unused
+insentry_stmt \"INSERT INTO ldap_entries (dn,oc_map_id,parent,keyval) VALUES (?,?,?,?)\"
+upper_func \"upper\"
+concat_pattern \"?||?\"
+has_ldapinfo_dn_ru no
+
+#database ldif
+#suffix \"dc=example,dc=com\"
+#rootdn \"cn=root,dc=example,dc=com\"
+#rootpw astlinux
+#directory /var/lib/ldap
+"
+}
+
+init () {
+
+ if [ "$LDAP_SERVER" != "yes" ]; then
+ if [ -f /tmp/etc/openldap/slapd.conf ]; then
+ rm /tmp/etc/openldap/slapd.conf
+ fi
+ return
+ fi
+
+ # Generate /etc/openldap/slapd.conf configuration file
+ if [ -f /mnt/kd/slapd.conf ]; then
+ echo "# Autogenerated. Edit /mnt/kd/slapd.conf file.
+" >/tmp/etc/openldap/slapd.conf
+ cat /mnt/kd/slapd.conf >>/tmp/etc/openldap/slapd.conf
+ else
+ echo "# Autogenerated. Do not edit.
+# A manually generated slapd config will use /mnt/kd/slapd.conf if it exists.
+" >/tmp/etc/openldap/slapd.conf
+ gen_slapd_conf >>/tmp/etc/openldap/slapd.conf
+ fi
+
+ chmod 600 /tmp/etc/openldap/slapd.conf
+
+ if [ ! -d /var/lib/ldap ]; then
+ mkdir -m 0700 -p /var/lib/ldap
+ fi
+
+ if [ ! -f /mnt/kd/ldap-odbc.sqlite3 ]; then
+ gen_sqlite3_schema
+ fi
+}
+
+start () {
+
+ if [ -f /etc/openldap/slapd.conf ]; then
+ echo "Starting LDAP Server (slapd)..."
+ slapd
+ fi
+}
+
+stop () {
+
+ if [ -f /var/run/slapd.pid ]; then
+ echo "Stopping LDAP Server (slapd)..."
+ kill $(cat /var/run/slapd.pid) >/dev/null 2>&1
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
Property changes on: branches/1.0/package/openldap/slapd.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/unixodbc/unixodbc.init
===================================================================
--- branches/1.0/package/unixodbc/unixodbc.init 2013-09-30 19:43:00 UTC (rev 6211)
+++ branches/1.0/package/unixodbc/unixodbc.init 2013-10-02 19:21:33 UTC (rev 6212)
@@ -102,6 +102,14 @@
Timeout=2000
"
install_odbc_dsn "asterisk-cdr" "$DATA"
+
+ DATA="
+Description=LDAP database
+Driver=SQLite3
+Database=/mnt/kd/ldap-odbc.sqlite3
+Timeout=2000
+"
+ install_odbc_dsn "ldap" "$DATA"
}
stop () {
@@ -112,6 +120,7 @@
# Remove DSN's
remove_odbc_dsn "asterisk"
remove_odbc_dsn "asterisk-cdr"
+ remove_odbc_dsn "ldap"
}
case $1 in
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-09-30 19:43:00 UTC (rev 6211)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-10-02 19:21:33 UTC (rev 6212)
@@ -482,6 +482,8 @@
#LDAP_DEREF="never" # Dereferencing: "never", "searching", "finding" or "always", defaults to "never"
#LDAP_TLS_CACERT="/mnt/kd/ssl/ca-ldap.pem" # TLS server CA certificates recognized by the client, file path
#LDAP_TLS_REQCERT="never" # TLS certificate check: "never", "allow", "try" or "demand", defaults to "demand"
+## LDAP Server - OpenLDAP (slapd)
+#LDAP_SERVER="yes" # Enable LDAP server slapd with "yes", defaults to "no"
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-10-03 01:04:41
|
Revision: 6213
http://sourceforge.net/p/astlinux/code/6213
Author: abelbeck
Date: 2013-10-03 01:04:36 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
slapd, configure for START_TLS support, note ldaps:// is deprecated
Modified Paths:
--------------
branches/1.0/package/openldap/slapd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openldap/slapd.init
===================================================================
--- branches/1.0/package/openldap/slapd.init 2013-10-02 19:21:33 UTC (rev 6212)
+++ branches/1.0/package/openldap/slapd.init 2013-10-03 01:04:36 UTC (rev 6213)
@@ -48,6 +48,7 @@
gen_slapd_conf()
{
+ local cert key
echo "include /etc/openldap/schema/core.schema
include /etc/openldap/schema/cosine.schema
@@ -55,8 +56,20 @@
pidfile /var/run/slapd.pid
argsfile /var/run/slapd.args
+"
-database sql
+ cert="${LDAP_SERVER_CERT:-/mnt/kd/ssl/sip-tls/keys/server.crt}"
+ key="${LDAP_SERVER_KEY:-/mnt/kd/ssl/sip-tls/keys/server.key}"
+ if [ -f "$cert" -a -f "$key" ]; then
+ echo "TLSCertificateFile $cert
+TLSCertificateKeyFile $key
+"
+ else
+ logger -t slapd -p kern.info "LDAP Server SSL configuration error, continuing..."
+ logger -t slapd -p kern.info "Try generating an Asterisk SIP-TLS Server Certificate, which LDAP Server will use by default."
+ fi
+
+ echo "database sql
#suffix \"o=sql,c=RU\"
#rootdn \"cn=root,o=sql,c=RU\"
suffix \"dc=example,dc=com\"
@@ -69,8 +82,9 @@
upper_func \"upper\"
concat_pattern \"?||?\"
has_ldapinfo_dn_ru no
+"
-#database ldif
+ echo "#database ldif
#suffix \"dc=example,dc=com\"
#rootdn \"cn=root,dc=example,dc=com\"
#rootpw astlinux
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-10-02 19:21:33 UTC (rev 6212)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-10-03 01:04:36 UTC (rev 6213)
@@ -484,6 +484,8 @@
#LDAP_TLS_REQCERT="never" # TLS certificate check: "never", "allow", "try" or "demand", defaults to "demand"
## LDAP Server - OpenLDAP (slapd)
#LDAP_SERVER="yes" # Enable LDAP server slapd with "yes", defaults to "no"
+#LDAP_SERVER_CERT="" # Defaults to "/mnt/kd/ssl/sip-tls/keys/server.crt"
+#LDAP_SERVER_KEY="" # Defaults to "/mnt/kd/ssl/sip-tls/keys/server.key"
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-10-07 02:39:51
|
Revision: 6218
http://sourceforge.net/p/astlinux/code/6218
Author: abelbeck
Date: 2013-10-07 02:39:47 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
slapd, move to ldif ldap backend, add 'ldap' user/group to run slapd under
Modified Paths:
--------------
branches/1.0/package/openldap/openldap.mk
branches/1.0/package/openldap/slapd.init
branches/1.0/project/astlinux/target_skeleton/etc/group
branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
branches/1.0/project/astlinux/target_skeleton/etc/passwd
branches/1.0/project/astlinux/target_skeleton/etc/shadow
branches/1.0/project/astlinux/target_skeleton/etc/shadow-
Modified: branches/1.0/package/openldap/openldap.mk
===================================================================
--- branches/1.0/package/openldap/openldap.mk 2013-10-05 18:46:23 UTC (rev 6217)
+++ branches/1.0/package/openldap/openldap.mk 2013-10-07 02:39:47 UTC (rev 6218)
@@ -23,11 +23,11 @@
--without-fetch \
--without-cyrus-sasl \
--enable-slapd \
- --enable-mdb \
--enable-null \
--disable-local \
--disable-bdb \
--disable-hdb \
+ --disable-mdb \
--disable-monitor \
--disable-relay
Modified: branches/1.0/package/openldap/slapd.init
===================================================================
--- branches/1.0/package/openldap/slapd.init 2013-10-05 18:46:23 UTC (rev 6217)
+++ branches/1.0/package/openldap/slapd.init 2013-10-07 02:39:47 UTC (rev 6218)
@@ -2,8 +2,6 @@
. /etc/rc.conf
-LISTEN_URLS="ldap://"
-
gen_slapd_conf()
{
local cert key
@@ -14,15 +12,17 @@
pidfile /var/run/slapd/slapd.pid
argsfile /var/run/slapd/slapd.args
+
+logfile /var/log/slapd/slapd.log
+loglevel stats
"
- cert="${LDAP_SERVER_CERT:-/mnt/kd/ssl/sip-tls/keys/server.crt}"
- key="${LDAP_SERVER_KEY:-/mnt/kd/ssl/sip-tls/keys/server.key}"
- if [ -f "$cert" -a -f "$key" ]; then
+ cert="${LDAP_SERVER_CERT:-/mnt/kd/ldap/certs/server.crt}"
+ key="${LDAP_SERVER_KEY:-/mnt/kd/ldap/certs/server.key}"
+ if [ -f "$cert" -a -f "$key" ] && [ "$(stat -c '%U:%G' "$cert")" = "ldap:ldap" -a "$(stat -c '%U:%G' "$key")" = "ldap:ldap" ]; then
echo "TLSCertificateFile $cert
TLSCertificateKeyFile $key
"
- LISTEN_URLS="ldap:// ldaps://"
else
logger -t slapd -p kern.info "LDAP Server SSL configuration error, continuing..."
logger -t slapd -p kern.info "Try generating an Asterisk SIP-TLS Server Certificate, which LDAP Server will use by default."
@@ -37,17 +37,11 @@
by users write
"
- echo "database mdb
+ echo "database ldif
suffix \"dc=example,dc=com\"
rootdn \"cn=Manager,dc=example,dc=com\"
rootpw astlinux
-
directory /var/lib/ldap
-
-index objectClass eq,pres
-
-maxreaders 64
-maxsize 10485760
"
}
@@ -60,6 +54,24 @@
return
fi
+ if [ ! -d /mnt/kd/ldap/data ]; then
+ mkdir -m 0700 -p /mnt/kd/ldap/data
+ mkdir -m 0755 -p /mnt/kd/ldap/certs
+ chown -R ldap:ldap /mnt/kd/ldap
+ fi
+ ln -snf /mnt/kd/ldap/data /var/lib/ldap
+ chown ldap:ldap /var/lib/ldap
+
+ # Use SIP TLS certs if they exist and ours don't exist
+ if [ -f /mnt/kd/ssl/sip-tls/keys/server.crt ] && [ ! -f /mnt/kd/ldap/certs/server.crt ]; then
+ cp -a /mnt/kd/ssl/sip-tls/keys/server.crt /mnt/kd/ldap/certs/server.crt
+ chown ldap:ldap /mnt/kd/ldap/certs/server.crt
+ fi
+ if [ -f /mnt/kd/ssl/sip-tls/keys/server.key ] && [ ! -f /mnt/kd/ldap/certs/server.key ]; then
+ cp -a /mnt/kd/ssl/sip-tls/keys/server.key /mnt/kd/ldap/certs/server.key
+ chown ldap:ldap /mnt/kd/ldap/certs/server.key
+ fi
+
# Generate /etc/openldap/slapd.conf configuration file
if [ -f /mnt/kd/slapd.conf ]; then
echo "# Autogenerated. Edit /mnt/kd/slapd.conf file.
@@ -73,25 +85,27 @@
fi
chmod 600 /tmp/etc/openldap/slapd.conf
+ chown ldap:ldap /tmp/etc/openldap/slapd.conf
mkdir -p /var/run/slapd
+ chown ldap:ldap /var/run/slapd
- if [ ! -d /var/lib/ldap ]; then
- mkdir -m 0700 -p /var/lib/ldap
- fi
- if [ ! -d /mnt/kd/ldap ]; then
- mkdir -m 0700 -p /mnt/kd/ldap
- fi
- if [ -d /mnt/kd/ldap ]; then
- ln -sf /mnt/kd/ldap/data.mdb /var/lib/ldap/data.mdb
- fi
+ mkdir -p /var/log/slapd
+ chown ldap:ldap /var/log/slapd
}
start () {
+ local LISTEN_URLS
if [ -f /etc/openldap/slapd.conf ]; then
echo "Starting LDAP Server (slapd)..."
- slapd -h "$LISTEN_URLS"
+
+ if grep -q '^TLSCertificateKeyFile' /etc/openldap/slapd.conf; then
+ LISTEN_URLS="ldap:/// ldaps:///"
+ else
+ LISTEN_URLS="ldap:///"
+ fi
+ slapd -u ldap -g ldap -h "$LISTEN_URLS"
fi
}
Modified: branches/1.0/project/astlinux/target_skeleton/etc/group
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/group 2013-10-05 18:46:23 UTC (rev 6217)
+++ branches/1.0/project/astlinux/target_skeleton/etc/group 2013-10-07 02:39:47 UTC (rev 6218)
@@ -13,5 +13,6 @@
video:x:44:
users:x:100:
prosody:x:130:
+ldap:x:439:
zabbix:x:906:
nobody:x:65535:
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN 2013-10-05 18:46:23 UTC (rev 6217)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN 2013-10-07 02:39:47 UTC (rev 6218)
@@ -10,7 +10,7 @@
local base="$1" user file IFS
unset IFS
- for user in zabbix prosody; do
+ for user in zabbix prosody ldap; do
for file in passwd shadow group; do
if ! grep -q "^${user}:" "/etc/${file}"; then
grep "^${user}:" "${base}/etc/${file}" >> "/etc/${file}"
Modified: branches/1.0/project/astlinux/target_skeleton/etc/passwd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-10-05 18:46:23 UTC (rev 6217)
+++ branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-10-07 02:39:47 UTC (rev 6218)
@@ -2,5 +2,6 @@
sshd:x:22:22:sshd:/dev/null:/bin/false
ftp:x:21:21:ftp user:/home/ftp:/bin/false
prosody:x:130:130:XMPP-server:/etc/prosody/data:/bin/false
+ldap:x:439:439:LDAP-server:/var/lib/ldap:/bin/false
zabbix:x:906:906:Zabbix User:/dev/null:/bin/false
nobody:x:1000:1000:no one:/dev/null:/bin/false
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow 2013-10-05 18:46:23 UTC (rev 6217)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow 2013-10-07 02:39:47 UTC (rev 6218)
@@ -2,5 +2,6 @@
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
prosody:!:0:0:99999:7:::
+ldap:!:0:0:99999:7:::
zabbix:!:0:0:99999:7:::
nobody:!:0:0:99999:7:::
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow-
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2013-10-05 18:46:23 UTC (rev 6217)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2013-10-07 02:39:47 UTC (rev 6218)
@@ -2,5 +2,6 @@
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
prosody:!:0:0:99999:7:::
+ldap:!:0:0:99999:7:::
zabbix:!:0:0:99999:7:::
nobody:!:0:0:99999:7:::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-10-10 05:35:09
|
Revision: 6220
http://sourceforge.net/p/astlinux/code/6220
Author: abelbeck
Date: 2013-10-10 05:35:04 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
slapd, add variables LDAP_SERVER_BASEDN, LDAP_SERVER_PASS and LDAP_SERVER_ANONYMOUS as well as auto creating address book schema
Modified Paths:
--------------
branches/1.0/package/openldap/openldap.mk
branches/1.0/package/openldap/slapd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openldap/openldap.mk
===================================================================
--- branches/1.0/package/openldap/openldap.mk 2013-10-09 04:39:01 UTC (rev 6219)
+++ branches/1.0/package/openldap/openldap.mk 2013-10-10 05:35:04 UTC (rev 6220)
@@ -18,6 +18,7 @@
--disable-debug \
--enable-syslog \
--enable-ipv6 \
+ --enable-crypt \
--with-tls \
--with-yielding_select=yes \
--without-fetch \
Modified: branches/1.0/package/openldap/slapd.init
===================================================================
--- branches/1.0/package/openldap/slapd.init 2013-10-09 04:39:01 UTC (rev 6219)
+++ branches/1.0/package/openldap/slapd.init 2013-10-10 05:35:04 UTC (rev 6220)
@@ -2,12 +2,83 @@
. /etc/rc.conf
+set_local_vars()
+{
+ local i base pass IFS
+
+ if [ -n "$LDAP_SERVER_BASEDN" ]; then
+ BASE="$LDAP_SERVER_BASEDN"
+ else
+ if [ -n "$DOMAIN" ]; then
+ base=""
+ IFS='. '
+ for i in $DOMAIN; do
+ base="$base${base:+,}dc=$i"
+ done
+ unset IFS
+ BASE="$base"
+ else
+ BASE="astlinux"
+ fi
+ fi
+
+ if [ -n "$LDAP_SERVER_PASS" ]; then
+ PASS="$(slapd -T passwd -s "$LDAP_SERVER_PASS")"
+ else
+ pass="$(sed -n -r -e 's/^admin:(.*)$/\1/p' /var/www/admin/.htpasswd 2>/dev/null)"
+ if [ -n "$pass" ]; then
+ PASS="{CRYPT}$pass"
+ else
+ PASS=""
+ fi
+ fi
+}
+
gen_default_schema()
{
+ local BASE="$1" pass dc STAFF_PW DIRECTORY_PW
- slapd -T add <<EOF
-EOF
+ pass="$(sed -n -r -e 's/^staff:(.*)$/\1/p' /var/www/admin/.htpasswd 2>/dev/null)"
+ if [ -n "$pass" ]; then
+ STAFF_PW="{CRYPT}$pass"
+ else
+ STAFF_PW="{SSHA}cCIf4iVXSEMZn5E/8xBMrSyggWmIIyOM"
+ fi
+ DIRECTORY_PW="{SSHA}cCIf4iVXSEMZn5E/8xBMrSyggWmIIyOM"
+
+ dc="$(echo "$BASE" | sed -n -r -e 's/^dc=([^,]*).*$/\1/p')"
+
+ echo "#
+dn: ${BASE}
+objectClass: dcObject
+objectClass: organization
+dc: ${dc}
+o: AstLinux LDAP Server
+
+dn: ou=addressbook,${BASE}
+objectClass: organizationalUnit
+ou: addressbook
+
+dn: ou=users,${BASE}
+objectClass: organizationalUnit
+ou: users
+
+dn: cn=staff,ou=users,${BASE}
+objectClass: person
+cn: staff
+sn: Staff
+description: Addressbook read/write user
+userPassword: ${STAFF_PW}
+
+dn: cn=directory,ou=users,${BASE}
+objectClass: person
+cn: directory
+sn: Directory
+description: Addressbook read-only user
+userPassword: ${DIRECTORY_PW}
+" | slapd -T add
+
chown -H ldap:ldap /var/lib/ldap/*.mdb
}
@@ -15,6 +86,8 @@
{
local cert key
+ set_local_vars
+
echo "include /etc/openldap/schema/core.schema
include /etc/openldap/schema/cosine.schema
include /etc/openldap/schema/inetorgperson.schema
@@ -24,40 +97,43 @@
argsfile /var/run/slapd/slapd.args
logfile /var/log/slapd/slapd.log
-loglevel stats
-"
+loglevel stats"
cert="${LDAP_SERVER_CERT:-/mnt/kd/ldap/certs/server.crt}"
key="${LDAP_SERVER_KEY:-/mnt/kd/ldap/certs/server.key}"
if [ -f "$cert" -a -f "$key" ] && [ "$(stat -c '%U:%G' "$cert")" = "ldap:ldap" -a "$(stat -c '%U:%G' "$key")" = "ldap:ldap" ]; then
- echo "TLSCertificateFile $cert
-TLSCertificateKeyFile $key
-"
+ echo "
+TLSCertificateFile $cert
+TLSCertificateKeyFile $key"
else
logger -t slapd -p kern.info "LDAP Server SSL configuration error, continuing..."
logger -t slapd -p kern.info "Try generating an Asterisk SIP-TLS Server Certificate, which LDAP Server will use by default."
fi
- echo "disallow bind_anon
+ if [ "$LDAP_SERVER_ANONYMOUS" != "yes" ]; then
+ echo "
+disallow bind_anon"
+ fi
+ echo "
access to attrs=userpassword
by self write
by anonymous auth
by * none
-access to dn.subtree="ou=addressbook,dc=example,dc=com"
- by dn.exact="uid=directory,ou=users,dc=example,dc=com" read
+access to dn.subtree=\"ou=addressbook,${BASE}\"
+ by dn.exact=\"cn=directory,ou=users,${BASE}\" read
by users write
by anonymous read
by * none
access to *
by self write
by users read
- by * none
-"
+ by * none"
- echo "database mdb
-suffix \"dc=example,dc=com\"
-rootdn \"cn=Manager,dc=example,dc=com\"
-rootpw astlinux
+ echo "
+database mdb
+suffix \"${BASE}\"
+rootdn \"cn=admin,${BASE}\"${PASS:+
+rootpw $PASS}
directory /var/lib/ldap
index objectClass eq,pres
@@ -123,15 +199,21 @@
}
start () {
- local LISTEN_URLS
+ local LISTEN_URLS BASE
if [ -f /etc/openldap/slapd.conf ]; then
echo "Starting LDAP Server (slapd)..."
- if [ ! -f /mnt/kd/ldap/data/data.mdb ]; then
- echo " Generating default LDAP schema..."
- gen_default_schema
+ # Extract the first Base DN suffix
+ BASE="$(sed -n -r -e 's/^suffix.*"(.*)".*$/\1/p' /etc/openldap/slapd.conf | head -n1)"
+ if [ -z "$(echo "$BASE" | sed -n -r -e 's/^dc=([^,]*).*$/\1/p')" ]; then
+ echo "slapd: Invalid Base DN, slapd failed to start."
+ return;
fi
+ if [ ! -f /mnt/kd/ldap/data/data.mdb ] || ! slapd -T cat -H "ldap:///???(ou=addressbook)" | grep -qi "^dn:.*ou=addressbook,${BASE}"; then
+ echo " Generating default LDAP schema for Base DN \"${BASE}\"..."
+ gen_default_schema "$BASE"
+ fi
if grep -q '^TLSCertificateKeyFile' /etc/openldap/slapd.conf; then
LISTEN_URLS="ldap:/// ldaps:///"
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-10-09 04:39:01 UTC (rev 6219)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-10-10 05:35:04 UTC (rev 6220)
@@ -484,8 +484,11 @@
#LDAP_TLS_REQCERT="never" # TLS certificate check: "never", "allow", "try" or "demand", defaults to "demand"
## LDAP Server - OpenLDAP (slapd)
#LDAP_SERVER="yes" # Enable LDAP server slapd with "yes", defaults to "no"
-#LDAP_SERVER_CERT="" # Defaults to "/mnt/kd/ssl/sip-tls/keys/server.crt"
-#LDAP_SERVER_KEY="" # Defaults to "/mnt/kd/ssl/sip-tls/keys/server.key"
+#LDAP_SERVER_BASEDN="dc=example,dc=com" # suffix and must begin with 'dc=', defaults to using DOMAIN, ex. foo.com -> "dc=foo,dc=com"
+#LDAP_SERVER_PASS="" # rootpw, defaults to web interface admin password
+#LDAP_SERVER_ANONYMOUS="yes" # If "yes" allow anonymous read-only access, defaults to "no"
+#LDAP_SERVER_CERT="" # Defaults to "/mnt/kd/ldap/certs/server.crt" using SIP-TLS cert
+#LDAP_SERVER_KEY="" # Defaults to "/mnt/kd/ldap/certs/server.key" using SIP-TLS key
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-10-15 21:45:39
|
Revision: 6230
http://sourceforge.net/p/astlinux/code/6230
Author: abelbeck
Date: 2013-10-15 21:45:34 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
slapd, add LDAP_SERVER_ANONYMOUS=localhost option, now the default, that allows anonymous read-only access to the localhost address
Modified Paths:
--------------
branches/1.0/package/openldap/slapd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openldap/slapd.init
===================================================================
--- branches/1.0/package/openldap/slapd.init 2013-10-15 16:25:03 UTC (rev 6229)
+++ branches/1.0/package/openldap/slapd.init 2013-10-15 21:45:34 UTC (rev 6230)
@@ -82,7 +82,7 @@
gen_slapd_conf()
{
- local cert key
+ local cert key ANONYMOUS
set_local_vars
@@ -109,10 +109,24 @@
logger -t slapd -p kern.info "Try generating an Asterisk SIP-TLS Server Certificate, which LDAP Server will use by default."
fi
- if [ "$LDAP_SERVER_ANONYMOUS" != "yes" ]; then
+ if [ "$LDAP_SERVER_ANONYMOUS" = "no" ]; then
+ ANONYMOUS=""
echo "
disallow bind_anon"
+ elif [ "$LDAP_SERVER_ANONYMOUS" = "yes" ]; then
+ ANONYMOUS="
+ by anonymous read"
+ elif [ "$IPV6" = "yes" ]; then # "localhost"
+ ANONYMOUS="
+ by peername.ip=127.0.0.1 read
+ by peername.ipv6=::1 read
+ by anonymous none"
+ else
+ ANONYMOUS="
+ by peername.ip=127.0.0.1 read
+ by anonymous none"
fi
+
echo "
access to attrs=userpassword
by self write
@@ -120,8 +134,7 @@
by * none
access to dn.subtree=\"ou=addressbook,${BASE}\"
by dn.exact=\"cn=directory,ou=users,${BASE}\" read
- by users write
- by anonymous read
+ by users write${ANONYMOUS:+$ANONYMOUS}
by * none
access to *
by self write
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-10-15 16:25:03 UTC (rev 6229)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-10-15 21:45:34 UTC (rev 6230)
@@ -477,18 +477,18 @@
## Example: ldapsearch -LLL "(sn=schiffer)" cn telephoneNumber cellPhone
## uses the defaults rather than having to be specified on each ldapsearch shell command.
## Note: All except LDAP_URI is automatically honored from ldap enabled PHP scripts.
-#LDAP_URI="ldap://ldap.memotoo.com" # Space separated list of LDAP servers, use ldap:// or ldaps://
-#LDAP_BASE="dc=9c6089bedaaee59f09bcdce487972160" # Defines the default base DN (Distinguished Name)
-#LDAP_DEREF="never" # Dereferencing: "never", "searching", "finding" or "always", defaults to "never"
-#LDAP_TLS_CACERT="/mnt/kd/ssl/ca-ldap.pem" # TLS server CA certificates recognized by the client, file path
-#LDAP_TLS_REQCERT="never" # TLS certificate check: "never", "allow", "try" or "demand", defaults to "demand"
+#LDAP_URI="ldap://127.0.0.1" # Space separated list of LDAP servers, use ldap:// or ldaps://
+#LDAP_BASE="ou=addressbook,dc=astlinux" # Defines the default base DN (Distinguished Name)
+#LDAP_DEREF="never" # Dereferencing: "never", "searching", "finding" or "always", defaults to "never"
+#LDAP_TLS_CACERT="/mnt/kd/ssl/ca-ldap.pem" # TLS server CA certificates recognized by the client, file path
+#LDAP_TLS_REQCERT="never" # TLS certificate check: "never", "allow", "try" or "demand", defaults to "demand"
## LDAP Server - OpenLDAP (slapd)
-#LDAP_SERVER="yes" # Enable LDAP server slapd with "yes", defaults to "no"
-#LDAP_SERVER_BASEDN="dc=example,dc=com" # suffix and must begin with 'dc=', defaults to using DOMAIN, ex. foo.com -> "dc=foo,dc=com"
-#LDAP_SERVER_PASS="" # rootpw, defaults to web interface admin password
-#LDAP_SERVER_ANONYMOUS="yes" # If "yes" allow anonymous read-only access, defaults to "no"
-#LDAP_SERVER_CERT="" # Defaults to "/mnt/kd/ldap/certs/server.crt" using SIP-TLS cert
-#LDAP_SERVER_KEY="" # Defaults to "/mnt/kd/ldap/certs/server.key" using SIP-TLS key
+#LDAP_SERVER="yes" # Enable LDAP server slapd with "yes", defaults to "no"
+#LDAP_SERVER_BASEDN="dc=astlinux" # suffix and must begin with 'dc=', defaults to using DOMAIN, ex. foo.com -> "dc=foo,dc=com"
+#LDAP_SERVER_PASS="" # rootpw, defaults to web interface admin password
+#LDAP_SERVER_ANONYMOUS="yes" # If "yes" allow anonymous read-only access, "localhost" peer only, or "no", defaults to "localhost"
+#LDAP_SERVER_CERT="" # Defaults to "/mnt/kd/ldap/certs/server.crt" using SIP-TLS cert
+#LDAP_SERVER_KEY="" # Defaults to "/mnt/kd/ldap/certs/server.key" using SIP-TLS key
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-10-22 20:42:09
|
Revision: 6240
http://sourceforge.net/p/astlinux/code/6240
Author: abelbeck
Date: 2013-10-22 20:42:06 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
Enable LDAP Server, BR2_PACKAGE_OPENLDAP_SERVER=y for default builds
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-10-22 16:49:02 UTC (rev 6239)
+++ branches/1.0/astlinux-ast11.config 2013-10-22 20:42:06 UTC (rev 6240)
@@ -737,7 +737,7 @@
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
-# BR2_PACKAGE_OPENLDAP_SERVER is not set
+BR2_PACKAGE_OPENLDAP_SERVER=y
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-10-22 16:49:02 UTC (rev 6239)
+++ branches/1.0/astlinux.config 2013-10-22 20:42:06 UTC (rev 6240)
@@ -739,7 +739,7 @@
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
-# BR2_PACKAGE_OPENLDAP_SERVER is not set
+BR2_PACKAGE_OPENLDAP_SERVER=y
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-10-22 16:49:02 UTC (rev 6239)
+++ branches/1.0/astlinux18.config 2013-10-22 20:42:06 UTC (rev 6240)
@@ -737,7 +737,7 @@
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
-# BR2_PACKAGE_OPENLDAP_SERVER is not set
+BR2_PACKAGE_OPENLDAP_SERVER=y
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-11-13 15:49:26
|
Revision: 6269
http://sourceforge.net/p/astlinux/code/6269
Author: abelbeck
Date: 2013-11-13 15:49:23 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
darkstat, new package, very small (75 KB) daemon that logs network statistics via PCAP to a database in memory. Uses lighttpd to proxy it's HTTP server as /admin/netstat/
http://unix4lyfe.org/darkstat/
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/lighttpd/lighttpd.conf
branches/1.0/package/lighttpd/lighttpd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/darkstat/
branches/1.0/package/darkstat/Config.in
branches/1.0/package/darkstat/darkstat-homepage-link.patch
branches/1.0/package/darkstat/darkstat-proxy-base.patch
branches/1.0/package/darkstat/darkstat.init
branches/1.0/package/darkstat/darkstat.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/astlinux-ast11.config 2013-11-13 15:49:23 UTC (rev 6269)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6211-dirty Configuration
-# Mon Sep 30 15:22:34 2013
+# Buildroot 2011.08-svn6268-dirty Configuration
+# Wed Nov 13 09:15:13 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -670,6 +670,7 @@
# BR2_PACKAGE_CAN_UTILS is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
+BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/astlinux.config 2013-11-13 15:49:23 UTC (rev 6269)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6211-dirty Configuration
-# Mon Sep 30 15:22:26 2013
+# Buildroot 2011.08-svn6268-dirty Configuration
+# Wed Nov 13 09:15:08 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -672,6 +672,7 @@
# BR2_PACKAGE_CAN_UTILS is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
+BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/astlinux18.config 2013-11-13 15:49:23 UTC (rev 6269)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6211-dirty Configuration
-# Mon Sep 30 15:22:28 2013
+# Buildroot 2011.08-svn6268-dirty Configuration
+# Wed Nov 13 09:15:10 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -670,6 +670,7 @@
# BR2_PACKAGE_CAN_UTILS is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
+BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/initrd.config 2013-11-13 15:49:23 UTC (rev 6269)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6091-dirty Configuration
-# Sat May 18 14:47:43 2013
+# Buildroot 2011.08-svn6268-dirty Configuration
+# Wed Nov 13 09:15:27 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -549,6 +549,7 @@
# BR2_PACKAGE_CAN_UTILS is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/package/Config.in 2013-11-13 15:49:23 UTC (rev 6269)
@@ -444,6 +444,7 @@
source "package/can-utils/Config.in"
source "package/ctorrent/Config.in"
source "package/cups/Config.in"
+source "package/darkstat/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/dhcp/Config.in"
endif
Added: branches/1.0/package/darkstat/Config.in
===================================================================
--- branches/1.0/package/darkstat/Config.in (rev 0)
+++ branches/1.0/package/darkstat/Config.in 2013-11-13 15:49:23 UTC (rev 6269)
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_DARKSTAT
+ bool "darkstat"
+ default n
+ select BR2_PACKAGE_LIBPCAP
+ help
+ Darkstat:
+ Captures network traffic, calculates statistics about usage,
+ and serves reports over HTTP.
+
+ http://unix4lyfe.org/darkstat/
+
Added: branches/1.0/package/darkstat/darkstat-homepage-link.patch
===================================================================
--- branches/1.0/package/darkstat/darkstat-homepage-link.patch (rev 0)
+++ branches/1.0/package/darkstat/darkstat-homepage-link.patch 2013-11-13 15:49:23 UTC (rev 6269)
@@ -0,0 +1,11 @@
+--- darkstat-3.0.717/html.c.orig 2013-11-12 12:08:13.000000000 -0600
++++ darkstat-3.0.717/html.c 2013-11-12 12:12:41.000000000 -0600
+@@ -51,7 +51,7 @@
+ "<li class=\"label\">" PACKAGE_STRING "</li>"
+ "<li><a href=\"%s/\">graphs</a></li>"
+ "<li><a href=\"%s/hosts/\">hosts</a></li>"
+- "<li><a href=\"" PACKAGE_URL "\">homepage</a></li>"
++ "<li class=\"label\">" PACKAGE_URL "</li>"
+ "</ul>\n"
+ "</div>\n"
+ "<div class=\"content\">\n"
Added: branches/1.0/package/darkstat/darkstat-proxy-base.patch
===================================================================
--- branches/1.0/package/darkstat/darkstat-proxy-base.patch (rev 0)
+++ branches/1.0/package/darkstat/darkstat-proxy-base.patch 2013-11-13 15:49:23 UTC (rev 6269)
@@ -0,0 +1,16 @@
+--- darkstat-3.0.717/http.c.orig 2013-11-12 12:15:44.000000000 -0600
++++ darkstat-3.0.717/http.c 2013-11-12 12:41:24.000000000 -0600
+@@ -250,6 +250,13 @@
+ assert(pos <= urilen);
+ out[pos] = '\0';
+
++ char *proxy_base = "/admin/netstat/"; /* str must begin and end with '/' */
++ if ((i = strlen(proxy_base)) > 1) {
++ if (str_starts_with(out, proxy_base)) {
++ memmove(out, out+i-1, strlen(out)-i+2);
++ }
++ }
++
+ #if 0
+ /* don't really need to do this and it's probably a performance hit: */
+ /* shorten buffer if necessary */
Added: branches/1.0/package/darkstat/darkstat.init
===================================================================
--- branches/1.0/package/darkstat/darkstat.init (rev 0)
+++ branches/1.0/package/darkstat/darkstat.init 2013-11-13 15:49:23 UTC (rev 6269)
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+PIDFILE="/var/run/darkstat.pid"
+
+CHROOT_DIR="/var/lib/darkstat"
+
+init () {
+ :
+}
+
+start () {
+ local filter="" promisc=""
+
+ if [ "$NETSTAT_SERVER" = "darkstat" ]; then
+ echo "Starting darkstat..."
+
+ mkdir -p $CHROOT_DIR
+ if [ -f $PIDFILE ]; then
+ rm $PIDFILE
+ fi
+
+ if [ -n "$NETSTAT_FILTER" ]; then
+ filter="$NETSTAT_FILTER"
+ fi
+ if [ "$NETSTAT_PROMISCUOUS" != "yes" ]; then
+ promisc="--no-promisc"
+ fi
+
+ darkstat -i $EXTIF --chroot $CHROOT_DIR --pidfile $PIDFILE --syslog ${promisc} ${filter:+-f "$filter"} \
+ -b 127.0.0.1 -p 667
+ fi
+}
+
+stop () {
+
+ if [ -f $PIDFILE ]; then
+ echo "Stopping darkstat..."
+
+ kill $(cat $PIDFILE) >/dev/null 2>&1
+ rm -f $PIDFILE
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Added: branches/1.0/package/darkstat/darkstat.mk
===================================================================
--- branches/1.0/package/darkstat/darkstat.mk (rev 0)
+++ branches/1.0/package/darkstat/darkstat.mk 2013-11-13 15:49:23 UTC (rev 6269)
@@ -0,0 +1,32 @@
+#############################################################
+#
+# darkstat
+#
+#############################################################
+DARKSTAT_VERSION = 3.0.717
+DARKSTAT_SITE = http://unix4lyfe.org/darkstat
+DARKSTAT_SOURCE = darkstat-$(DARKSTAT_VERSION).tar.bz2
+
+DARKSTAT_DEPENDENCIES = zlib libpcap
+
+DARKSTAT_UNINSTALL_STAGING_OPT = --version
+
+DARKSTAT_CONF_OPT = \
+ --disable-debug \
+ --with-chroot-dir=/var/empty
+
+define DARKSTAT_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/darkstat $(TARGET_DIR)/usr/sbin/
+ $(INSTALL) -D -m 0755 package/darkstat/darkstat.init $(TARGET_DIR)/etc/init.d/darkstat
+ ln -sf ../../init.d/darkstat $(TARGET_DIR)/etc/runlevels/default/S75darkstat
+ ln -sf ../../init.d/darkstat $(TARGET_DIR)/etc/runlevels/default/K15darkstat
+endef
+
+define DARKSTAT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/darkstat
+ rm -f $(TARGET_DIR)/etc/init.d/darkstat
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S75darkstat
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K15darkstat
+endef
+
+$(eval $(call AUTOTARGETS,package,darkstat))
Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/package/lighttpd/lighttpd.conf 2013-11-13 15:49:23 UTC (rev 6269)
@@ -131,16 +131,27 @@
)
@CLI_PROXY_SERVER@$HTTP["scheme"] == "https" {
-@CLI_PROXY_SERVER@ proxy.server = ( "/admin/cli/" =>
-@CLI_PROXY_SERVER@ ( "localhost" =>
-@CLI_PROXY_SERVER@ (
-@CLI_PROXY_SERVER@ "host" => "127.0.0.1",
-@CLI_PROXY_SERVER@ "port" => "4200"
-@CLI_PROXY_SERVER@ )
-@CLI_PROXY_SERVER@ )
-@CLI_PROXY_SERVER@ )
+@CLI_PROXY_SERVER@ proxy.server += ( "/admin/cli/" =>
+@CLI_PROXY_SERVER@ ( "localhost" =>
+@CLI_PROXY_SERVER@ (
+@CLI_PROXY_SERVER@ "host" => "127.0.0.1",
+@CLI_PROXY_SERVER@ "port" => "4200"
+@CLI_PROXY_SERVER@ )
+@CLI_PROXY_SERVER@ )
+@CLI_PROXY_SERVER@ )
@CLI_PROXY_SERVER@}
+@NETSTAT_SERVER@$HTTP["scheme"] == "https" {
+@NETSTAT_SERVER@ proxy.server += ( "/admin/netstat/" =>
+@NETSTAT_SERVER@ ( "localhost" =>
+@NETSTAT_SERVER@ (
+@NETSTAT_SERVER@ "host" => "127.0.0.1",
+@NETSTAT_SERVER@ "port" => "667"
+@NETSTAT_SERVER@ )
+@NETSTAT_SERVER@ )
+@NETSTAT_SERVER@ )
+@NETSTAT_SERVER@}
+
@PHO...@al... += ( "/phoneprov/" => "/mnt/kd/phoneprov/" )
@PHONEPROV@
@PHONEPROV@$HTTP["url"] =~ "^/phoneprov/" {
Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/package/lighttpd/lighttpd.init 2013-11-13 15:49:23 UTC (rev 6269)
@@ -71,6 +71,11 @@
else
cli_proxy_server="#"
fi
+ if [ "$NETSTAT_SERVER" = "darkstat" ]; then
+ netstat_server=""
+ else
+ netstat_server="#"
+ fi
if [ -d /mnt/kd/phoneprov ]; then
phoneprov=""
else
@@ -107,6 +112,7 @@
-e "s|@HTTPSCGI@|${httpscgi}|g" \
-e "s|@IPV6@|${ipv6}|g" \
-e "s|@CLI_PROXY_SERVER@|${cli_proxy_server}|g" \
+ -e "s|@NETSTAT_SERVER@|${netstat_server}|g" \
-e "s|@PHONEPROV@|${phoneprov}|g" \
-e "s!@PHONEPROV_ALLOW@!${phoneprov_allow}!g" \
-e "s|@FOP2@|${fop2}|g" \
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-11-13 15:49:23 UTC (rev 6269)
@@ -300,6 +300,14 @@
## To start shellinaboxd, set to 'shellinaboxd'. Disabled by default.
CLI_PROXY_SERVER=""
+## Network Statistics Server (darkstat)
+## Captures network traffic, calculates statistics about usage, and serves reports over HTTP.
+## HTTP only reachable on 127.0.0.1:667 via the web interface NetStat tab, proxied via lighttpd.
+## To start darkstat, set to 'darkstat'. Disabled by default.
+NETSTAT_SERVER=""
+#NETSTAT_FILTER="port 5060 or 5061 or 22" # Specify PCAP filter rule, defaults to all. See tcpdump(1) documentation.
+#NETSTAT_PROMISCUOUS="yes" # If "yes" set interface to promiscuous mode, defaults to "no"
+
## HTTPS Server
HTTPSDIR="/stat/var/www" # Define the location to serve HTTPS from
HTTPS_LISTING="yes" # Allow directory listing if no index.* file exists
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/runnix-uclibc.config 2013-11-13 15:49:23 UTC (rev 6269)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6091-dirty Configuration
-# Sat May 18 14:47:41 2013
+# Buildroot 2011.08-svn6268-dirty Configuration
+# Wed Nov 13 09:15:22 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -839,6 +839,7 @@
# ctorrent requires a toolchain with C++ support enabled
#
# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DNSMASQ is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-11-11 21:40:37 UTC (rev 6268)
+++ branches/1.0/runnix.config 2013-11-13 15:49:23 UTC (rev 6269)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6091-dirty Configuration
-# Sat May 18 14:47:40 2013
+# Buildroot 2011.08-svn6268-dirty Configuration
+# Wed Nov 13 09:15:17 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -578,6 +578,7 @@
# BR2_PACKAGE_CAN_UTILS is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DNSMASQ is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-11-14 01:40:02
|
Revision: 6273
http://sourceforge.net/p/astlinux/code/6273
Author: abelbeck
Date: 2013-11-14 01:39:58 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
darkstat, add NETSTAT_CAPTURE variable to specify multiple interfaces
Modified Paths:
--------------
branches/1.0/package/darkstat/darkstat.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/darkstat/darkstat.init
===================================================================
--- branches/1.0/package/darkstat/darkstat.init 2013-11-13 21:15:45 UTC (rev 6272)
+++ branches/1.0/package/darkstat/darkstat.init 2013-11-14 01:39:58 UTC (rev 6273)
@@ -6,12 +6,37 @@
CHROOT_DIR="/var/lib/darkstat"
+is_darkstat_enabled()
+{
+ # args: IF_Name
+ local ifname IFS
+
+ unset IFS
+ for ifname in $NETSTAT_CAPTURE; do
+ if [ "$ifname" = "$1" ]; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+is_interface_enabled()
+{
+ # args: IF, IP, NM
+ if [ -n "$1" -a "$1" != "none" -a -n "$2" -a -n "$3" ]; then
+ return 0
+ fi
+ return 1
+}
+
+
init () {
:
}
start () {
- local filter="" promisc=""
+ local promisc="" interfaces="" f_ext="" f_lan="" f_lan2="" f_lan3="" f_dmz=""
if [ "$NETSTAT_SERVER" = "darkstat" ]; then
echo "Starting darkstat..."
@@ -21,14 +46,37 @@
rm $PIDFILE
fi
- if [ -n "$NETSTAT_FILTER" ]; then
- filter="$NETSTAT_FILTER"
- fi
if [ "$NETSTAT_PROMISCUOUS" != "yes" ]; then
promisc="--no-promisc"
fi
- darkstat -i $EXTIF --chroot $CHROOT_DIR --pidfile $PIDFILE --syslog ${promisc} ${filter:+-f "$filter"} \
+ if is_darkstat_enabled EXTIF; then
+ interfaces="$interfaces${interfaces:+ }-i $EXTIF"
+ f_ext="$NETSTAT_FILTER"
+ fi
+ if is_darkstat_enabled INTIF && is_interface_enabled "$INTIF" "$INTIP" "$INTNM"; then
+ interfaces="$interfaces${interfaces:+ }-i $INTIF"
+ f_int="$NETSTAT_FILTER"
+ fi
+ if is_darkstat_enabled INT2IF && is_interface_enabled "$INT2IF" "$INT2IP" "$INT2NM"; then
+ interfaces="$interfaces${interfaces:+ }-i $INT2IF"
+ f_int2="$NETSTAT_FILTER"
+ fi
+ if is_darkstat_enabled INT3IF && is_interface_enabled "$INT3IF" "$INT3IP" "$INT3NM"; then
+ interfaces="$interfaces${interfaces:+ }-i $INT3IF"
+ f_int3="$NETSTAT_FILTER"
+ fi
+ if is_darkstat_enabled DMZIF && is_interface_enabled "$DMZIF" "$DMZIP" "$DMZNM"; then
+ interfaces="$interfaces${interfaces:+ }-i $DMZIF"
+ f_dmz="$NETSTAT_FILTER"
+ fi
+ if [ -z "$interfaces" ]; then
+ echo "darkstat: No available interfaces for NETSTAT_CAPTURE variable."
+ exit 1
+ fi
+
+ darkstat ${interfaces} --chroot $CHROOT_DIR --pidfile $PIDFILE --syslog ${promisc}${f_ext:+ -f "$f_ext"} \
+ ${f_int:+ -f "$f_int"}${f_int2:+ -f "$f_int2"}${f_int3:+ -f "$f_int3"}${f_dmz:+ -f "$f_dmz"} \
-b 127.0.0.1 -p 667 $NETSTAT_OPTIONS
fi
}
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-11-13 21:15:45 UTC (rev 6272)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-11-14 01:39:58 UTC (rev 6273)
@@ -307,6 +307,13 @@
NETSTAT_SERVER=""
#NETSTAT_FILTER="port 5060 or 5061 or 22" # Specify PCAP filter rule, defaults to all. See tcpdump(1) documentation.
#NETSTAT_PROMISCUOUS="yes" # If "yes" set interface to promiscuous mode, defaults to "no"
+##
+## Capture interfaces, NETSTAT_CAPTURE, at least one must be specified.
+## Define: Interface_Name, space separated for multiple
+## Interface_Name is: "EXTIF" for External Interface
+## "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
+## "DMZIF" for DMZ Interface
+#NETSTAT_CAPTURE="EXTIF"
## HTTPS Server
HTTPSDIR="/stat/var/www" # Define the location to serve HTTPS from
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-11-15 06:46:56
|
Revision: 6278
http://sourceforge.net/p/astlinux/code/6278
Author: abelbeck
Date: 2013-11-15 06:46:52 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
Fix long time inconsistency for 'nobody' in /etc/passwd and /etc/group, use standard uid/gid values
Modified Paths:
--------------
branches/1.0/package/inadyn/dynamicdns.init
branches/1.0/project/astlinux/target_skeleton/etc/group
branches/1.0/project/astlinux/target_skeleton/etc/passwd
Modified: branches/1.0/package/inadyn/dynamicdns.init
===================================================================
--- branches/1.0/package/inadyn/dynamicdns.init 2013-11-15 00:31:13 UTC (rev 6277)
+++ branches/1.0/package/inadyn/dynamicdns.init 2013-11-15 06:46:52 UTC (rev 6278)
@@ -119,7 +119,7 @@
update_period_sec $update_period_sec
forced_update_period 2419200
syslog
-change_persona 65535:65535
+change_persona 65534:65534
background" > /tmp/etc/inadyn.conf
fi
}
Modified: branches/1.0/project/astlinux/target_skeleton/etc/group
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/group 2013-11-15 00:31:13 UTC (rev 6277)
+++ branches/1.0/project/astlinux/target_skeleton/etc/group 2013-11-15 06:46:52 UTC (rev 6278)
@@ -15,4 +15,4 @@
prosody:x:130:
ldap:x:439:
zabbix:x:906:
-nobody:x:65535:
+nobody:x:65534:
Modified: branches/1.0/project/astlinux/target_skeleton/etc/passwd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-11-15 00:31:13 UTC (rev 6277)
+++ branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-11-15 06:46:52 UTC (rev 6278)
@@ -4,4 +4,4 @@
prosody:x:130:130:XMPP-server:/etc/prosody/data:/bin/false
ldap:x:439:439:LDAP-server:/var/lib/ldap:/bin/false
zabbix:x:906:906:Zabbix User:/dev/null:/bin/false
-nobody:x:1000:1000:no one:/dev/null:/bin/false
+nobody:x:65534:65534:nobody:/dev/null:/bin/false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-11-15 20:56:27
|
Revision: 6279
http://sourceforge.net/p/astlinux/code/6279
Author: abelbeck
Date: 2013-11-15 20:56:20 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
Fix long time incorrect executable permissions for some /etc files
Modified Paths:
--------------
branches/1.0/package/dnsmasq/dnsmasq.mk
Property Changed:
----------------
branches/1.0/project/astlinux/board/alix/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/net4801/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/via/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/via-serial/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/viac7/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/viac7-serial/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/wrap/target_skeleton/etc/inittab
branches/1.0/project/astlinux/target_skeleton/etc/group
branches/1.0/project/astlinux/target_skeleton/etc/gshadow
branches/1.0/project/astlinux/target_skeleton/etc/inittab
branches/1.0/project/astlinux/target_skeleton/etc/passwd
branches/1.0/project/astlinux/target_skeleton/etc/protocols
Modified: branches/1.0/package/dnsmasq/dnsmasq.mk
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.mk 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/package/dnsmasq/dnsmasq.mk 2013-11-15 20:56:20 UTC (rev 6279)
@@ -75,7 +75,7 @@
define DNSMASQ_INSTALL_TARGET_CMDS
$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install
$(INSTALL) -m 0755 -D package/dnsmasq/dnsmasq.init $(TARGET_DIR)/etc/init.d/dnsmasq
- $(INSTALL) -m 0755 -D package/dnsmasq/dnsmasq.static $(TARGET_DIR)/stat/etc/dnsmasq.static
+ $(INSTALL) -m 0644 -D package/dnsmasq/dnsmasq.static $(TARGET_DIR)/stat/etc/dnsmasq.static
ln -sf /tmp/etc/dnsmasq.conf $(TARGET_DIR)/etc/dnsmasq.conf
ln -sf /tmp/etc/dnsmasq.static $(TARGET_DIR)/etc/dnsmasq.static
endef
Index: branches/1.0/project/astlinux/board/alix/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/alix/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/alix/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/alix/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/net4801/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/net4801/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/net4801/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/net4801/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/via/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/via/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/via/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/via/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/via-serial/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/via-serial/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/via-serial/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/via-serial/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/viac7/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/viac7/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/viac7/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/viac7/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/viac7-serial/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/viac7-serial/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/viac7-serial/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/viac7-serial/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/board/wrap/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/wrap/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/board/wrap/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/board/wrap/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/1.0/project/astlinux/target_skeleton/etc/group
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/group 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/target_skeleton/etc/group 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/group
___________________________________________________________________
Deleted: svn:executable
\ No newline at end of property
Index: branches/1.0/project/astlinux/target_skeleton/etc/gshadow
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/gshadow 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/target_skeleton/etc/gshadow 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/gshadow
___________________________________________________________________
Deleted: svn:executable
\ No newline at end of property
Index: branches/1.0/project/astlinux/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/inittab 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/target_skeleton/etc/inittab 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/inittab
___________________________________________________________________
Deleted: svn:executable
\ No newline at end of property
Index: branches/1.0/project/astlinux/target_skeleton/etc/passwd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/passwd
___________________________________________________________________
Deleted: svn:executable
\ No newline at end of property
Index: branches/1.0/project/astlinux/target_skeleton/etc/protocols
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/protocols 2013-11-15 06:46:52 UTC (rev 6278)
+++ branches/1.0/project/astlinux/target_skeleton/etc/protocols 2013-11-15 20:56:20 UTC (rev 6279)
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/protocols
___________________________________________________________________
Deleted: svn:executable
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-11-16 20:38:40
|
Revision: 6282
http://sourceforge.net/p/astlinux/code/6282
Author: abelbeck
Date: 2013-11-16 20:38:37 +0000 (Sat, 16 Nov 2013)
Log Message:
-----------
pciutils version bump to 3.2.1
Modified Paths:
--------------
branches/1.0/initrd.config
branches/1.0/package/pciutils/Config.in
branches/1.0/package/pciutils/pciutils.mk
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-11-16 01:43:48 UTC (rev 6281)
+++ branches/1.0/initrd.config 2013-11-16 20:38:37 UTC (rev 6282)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6268-dirty Configuration
-# Wed Nov 13 09:15:27 2013
+# Buildroot 2011.08-svn6281-dirty Configuration
+# Sat Nov 16 14:15:32 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -353,7 +353,6 @@
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
-# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
Modified: branches/1.0/package/pciutils/Config.in
===================================================================
--- branches/1.0/package/pciutils/Config.in 2013-11-16 01:43:48 UTC (rev 6281)
+++ branches/1.0/package/pciutils/Config.in 2013-11-16 20:38:37 UTC (rev 6282)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PCIUTILS
bool "pciutils"
+ depends on BR2_LINUX_KERNEL
help
Various utilities dealing with the PCI bus.
Provides things like setpci and lspci.
Modified: branches/1.0/package/pciutils/pciutils.mk
===================================================================
--- branches/1.0/package/pciutils/pciutils.mk 2013-11-16 01:43:48 UTC (rev 6281)
+++ branches/1.0/package/pciutils/pciutils.mk 2013-11-16 20:38:37 UTC (rev 6282)
@@ -4,13 +4,16 @@
#
#############################################################
-PCIUTILS_VERSION = 3.1.10
+PCIUTILS_VERSION = 3.2.1
PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
PCIUTILS_INSTALL_STAGING = YES
+# Depend on linux to define LINUX_VERSION_PROBED
+PCIUTILS_DEPENDENCIES = linux
PCIUTILS_ZLIB=no
PCIUTILS_DNS=no
PCIUTILS_SHARED=yes
+PCIUTILS_KMOD = no
# Build after busybox since it's got a lightweight lspci
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -20,7 +23,7 @@
define PCIUTILS_CONFIGURE_CMDS
$(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh
$(SED) 's/uname -s/echo Linux/' \
- -e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \
+ -e 's/uname -r/echo $(LINUX_VERSION_PROBED)/' \
$(PCIUTILS_DIR)/lib/configure
$(SED) 's/^STRIP/#STRIP/' $(PCIUTILS_DIR)/Makefile
endef
@@ -36,6 +39,7 @@
SHARED=$(PCIUTILS_SHARED) \
ZLIB=$(PCIUTILS_ZLIB) \
DNS=$(PCIUTILS_DNS) \
+ LIBKMOD=$(PCIUTILS_KMOD) \
PREFIX=/usr
endef
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-12-12 22:20:27
|
Revision: 6309
http://sourceforge.net/p/astlinux/code/6309
Author: abelbeck
Date: 2013-12-12 22:20:24 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
dahdi-linux, add BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE build option, not enabled by default
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/dahdi-linux/Config.in
branches/1.0/package/dahdi-linux/dahdi-linux.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-12-12 19:32:06 UTC (rev 6308)
+++ branches/1.0/astlinux-ast11.config 2013-12-12 22:20:24 UTC (rev 6309)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6268-dirty Configuration
-# Wed Nov 13 09:15:13 2013
+# Buildroot 2011.08-svn6308-dirty Configuration
+# Thu Dec 12 16:11:16 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -175,6 +175,7 @@
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
BR2_PACKAGE_DAHDI_HFCS=y
+# BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE is not set
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-12-12 19:32:06 UTC (rev 6308)
+++ branches/1.0/astlinux.config 2013-12-12 22:20:24 UTC (rev 6309)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6268-dirty Configuration
-# Wed Nov 13 09:15:08 2013
+# Buildroot 2011.08-svn6308-dirty Configuration
+# Thu Dec 12 16:11:07 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -181,6 +181,7 @@
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
# BR2_PACKAGE_DAHDI_HFCS is not set
+# BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE is not set
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-12-12 19:32:06 UTC (rev 6308)
+++ branches/1.0/astlinux18.config 2013-12-12 22:20:24 UTC (rev 6309)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6268-dirty Configuration
-# Wed Nov 13 09:15:10 2013
+# Buildroot 2011.08-svn6308-dirty Configuration
+# Thu Dec 12 16:11:09 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -175,6 +175,7 @@
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
BR2_PACKAGE_DAHDI_HFCS=y
+# BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE is not set
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
Modified: branches/1.0/package/dahdi-linux/Config.in
===================================================================
--- branches/1.0/package/dahdi-linux/Config.in 2013-12-12 19:32:06 UTC (rev 6308)
+++ branches/1.0/package/dahdi-linux/Config.in 2013-12-12 22:20:24 UTC (rev 6309)
@@ -30,3 +30,12 @@
http://sourceforge.net/projects/dahdi-hfcs/
+config BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE
+ bool "dahdi_no_card_firmware"
+ default n
+ depends on BR2_PACKAGE_DAHDI_LINUX
+ help
+ Reduce image size by removing PCI / PCI-e card firmware files.
+
+ It saves 3 MB (DAHDI 2.6) or 8 MB (DAHDI 2.8) of uncompressed space.
+
Modified: branches/1.0/package/dahdi-linux/dahdi-linux.mk
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux.mk 2013-12-12 19:32:06 UTC (rev 6308)
+++ branches/1.0/package/dahdi-linux/dahdi-linux.mk 2013-12-12 22:20:24 UTC (rev 6309)
@@ -78,6 +78,9 @@
if [ -d $(TARGET_DIR)/usr/lib/hotplug/firmware ]; then \
find $(TARGET_DIR)/usr/lib/hotplug/firmware/ -type f -name "*dahdi-fw-*" -print0 | xargs -0 rm -f ; \
fi
+ifeq ($(BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE),y)
+ find $(TARGET_DIR)/lib/firmware/ -type f -name "*dahdi-fw-*" -print0 | xargs -0 rm -f
+endif
$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
dahdi-linux: $(TARGET_DIR)/$(DAHDI_LINUX_TARGET_BINARY) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-12-25 20:15:24
|
Revision: 6323
http://sourceforge.net/p/astlinux/code/6323
Author: abelbeck
Date: 2013-12-25 20:15:21 +0000 (Wed, 25 Dec 2013)
Log Message:
-----------
nut, new package from upstream Buildroot, disabled. Still needs 'upsd' init.d script and a lot of configurationspread across several files. Adds 1.1 MB to the compressed image when enabled.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/nut/
branches/1.0/package/nut/Config.in
branches/1.0/package/nut/nut-0001-foo-config.patch
branches/1.0/package/nut/nut.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-12-24 02:51:05 UTC (rev 6322)
+++ branches/1.0/astlinux-ast11.config 2013-12-25 20:15:21 UTC (rev 6323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6308-dirty Configuration
-# Thu Dec 12 16:11:16 2013
+# Buildroot 2011.08-svn6322-dirty Configuration
+# Wed Dec 25 14:09:50 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -736,6 +736,7 @@
BR2_PACKAGE_NTP_NTPQ=y
# BR2_PACKAGE_NTP_NTPTRACE is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
+# BR2_PACKAGE_NUT is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-12-24 02:51:05 UTC (rev 6322)
+++ branches/1.0/astlinux.config 2013-12-25 20:15:21 UTC (rev 6323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6308-dirty Configuration
-# Thu Dec 12 16:11:07 2013
+# Buildroot 2011.08-svn6322-dirty Configuration
+# Wed Dec 25 14:09:47 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -738,6 +738,7 @@
BR2_PACKAGE_NTP_NTPQ=y
# BR2_PACKAGE_NTP_NTPTRACE is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
+# BR2_PACKAGE_NUT is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-12-24 02:51:05 UTC (rev 6322)
+++ branches/1.0/astlinux18.config 2013-12-25 20:15:21 UTC (rev 6323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6308-dirty Configuration
-# Thu Dec 12 16:11:09 2013
+# Buildroot 2011.08-svn6322-dirty Configuration
+# Wed Dec 25 14:09:48 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -736,6 +736,7 @@
BR2_PACKAGE_NTP_NTPQ=y
# BR2_PACKAGE_NTP_NTPTRACE is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
+# BR2_PACKAGE_NUT is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-12-24 02:51:05 UTC (rev 6322)
+++ branches/1.0/initrd.config 2013-12-25 20:15:21 UTC (rev 6323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6281-dirty Configuration
-# Sat Nov 16 14:15:32 2013
+# Buildroot 2011.08-svn6322-dirty Configuration
+# Wed Dec 25 14:09:57 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -586,6 +586,7 @@
# BR2_PACKAGE_NGREP is not set
# BR2_PACKAGE_NMAP is not set
# BR2_PACKAGE_NTP is not set
+# BR2_PACKAGE_NUT is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENLDAP is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-12-24 02:51:05 UTC (rev 6322)
+++ branches/1.0/package/Config.in 2013-12-25 20:15:21 UTC (rev 6323)
@@ -491,6 +491,7 @@
source "package/ngrep/Config.in"
source "package/nmap/Config.in"
source "package/ntp/Config.in"
+source "package/nut/Config.in"
source "package/nuttcp/Config.in"
source "package/olsr/Config.in"
source "package/openldap/Config.in"
Added: branches/1.0/package/nut/Config.in
===================================================================
--- branches/1.0/package/nut/Config.in (rev 0)
+++ branches/1.0/package/nut/Config.in 2013-12-25 20:15:21 UTC (rev 6323)
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_NUT
+ bool "nut"
+ help
+ Network UPS tools
+
+ The primary goal of the Network UPS Tools (NUT) project is to provide
+ support for Power Devices, such as Uninterruptible Power Supplies,
+ Power Distribution Units and Solar Controllers.
+
+ http://www.networkupstools.org/
+
Added: branches/1.0/package/nut/nut-0001-foo-config.patch
===================================================================
--- branches/1.0/package/nut/nut-0001-foo-config.patch (rev 0)
+++ branches/1.0/package/nut/nut-0001-foo-config.patch 2013-12-25 20:15:21 UTC (rev 6323)
@@ -0,0 +1,72 @@
+configure: fix calls to {gdlib,net-snmp}-config
+
+nut directly calls to {gdlib,net-snmp}-config. In Buildroot,
+those are not in the PATH, and nut would catch those of the
+system (if they are installed), or miss them entirely.
+
+Fix that by using environment variables that will tell where
+to look for them.
+
+Note: libusb also uses libusb-config, but only as a fallback
+if pkg-config fails. Since we ensure that pkg-config exists,
+and libusb is properly installed before we build nut, there
+is no need to fix the libusb-config calls, since they won't
+be called at all.
+
+Signed-off-by: "Yann E. MORIN" <yan...@fr...>
+
+diff -durN nut-2.6.5.orig/m4/nut_check_libgd.m4 nut-2.6.5/m4/nut_check_libgd.m4
+--- nut-2.6.5.orig/m4/nut_check_libgd.m4 2012-07-31 19:38:56.000000000 +0200
++++ nut-2.6.5/m4/nut_check_libgd.m4 2013-11-01 16:24:02.626549810 +0100
+@@ -20,7 +20,7 @@
+ LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
+
+ AC_MSG_CHECKING(for gd version via gdlib-config)
+- GD_VERSION=`gdlib-config --version 2>/dev/null`
++ GD_VERSION=`${GDLIB_CONFIG} --version 2>/dev/null`
+ if test "$?" != "0" -o -z "${GD_VERSION}"; then
+ GD_VERSION="none"
+ fi
+@@ -34,9 +34,9 @@
+ AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]])
+ ;;
+ *)
+- CFLAGS="`gdlib-config --includes 2>/dev/null`"
+- LDFLAGS="`gdlib-config --ldflags 2>/dev/null`"
+- LIBS="`gdlib-config --libs 2>/dev/null`"
++ CFLAGS="`${GDLIB_CONFIG} --includes 2>/dev/null`"
++ LDFLAGS="`${GDLIB_CONFIG} --ldflags 2>/dev/null`"
++ LIBS="`${GDLIB_CONFIG} --libs 2>/dev/null`"
+ ;;
+ esac
+
+diff -durN nut-2.7.1/m4/nut_check_libnetsnmp.m4.orig nut-2.7.1/m4/nut_check_libnetsnmp.m4
+--- nut-2.7.1/m4/nut_check_libnetsnmp.m4.orig 2013-12-25 12:09:14.000000000 -0600
++++ nut-2.7.1/m4/nut_check_libnetsnmp.m4 2013-12-25 12:10:33.000000000 -0600
+@@ -15,7 +15,7 @@
+
+ dnl See which version of the Net-SNMP library (if any) is installed
+ AC_MSG_CHECKING(for Net-SNMP version via net-snmp-config)
+- SNMP_VERSION=`net-snmp-config --version 2>/dev/null`
++ SNMP_VERSION=`${NET_SNMP_CONFIG} --version 2>/dev/null`
+ if test "$?" != "0" -o -z "${SNMP_VERSION}"; then
+ SNMP_VERSION="none"
+ fi
+@@ -33,7 +33,7 @@
+ CFLAGS="${withval}"
+ ;;
+ esac
+- ], [CFLAGS="`net-snmp-config --base-cflags 2>/dev/null`"])
++ ], [CFLAGS="`${NET_SNMP_CONFIG} --base-cflags 2>/dev/null`"])
+ AC_MSG_RESULT([${CFLAGS}])
+
+ AC_MSG_CHECKING(for Net-SNMP libs)
+@@ -48,7 +48,7 @@
+ LIBS="${withval}"
+ ;;
+ esac
+- ], [LIBS="`net-snmp-config --libs 2>/dev/null`"])
++ ], [LIBS="`${NET_SNMP_CONFIG} --libs 2>/dev/null`"])
+ AC_MSG_RESULT([${LIBS}])
+
+ dnl Check if the Net-SNMP library is usable
Added: branches/1.0/package/nut/nut.mk
===================================================================
--- branches/1.0/package/nut/nut.mk (rev 0)
+++ branches/1.0/package/nut/nut.mk 2013-12-25 20:15:21 UTC (rev 6323)
@@ -0,0 +1,95 @@
+################################################################################
+#
+# nut
+#
+################################################################################
+
+NUT_VERSION_MAJOR = 2.7
+NUT_VERSION = $(NUT_VERSION_MAJOR).1
+NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR)/
+NUT_DEPENDENCIES = host-pkg-config
+
+# Our patch changes m4 macros, so we need to autoreconf
+NUT_AUTORECONF = YES
+
+# Put the PID files in a read-write place (/var/run is a tmpfs)
+# since the default location (/var/state/ups) maybe readonly.
+NUT_CONF_OPT = \
+ --with-altpidpath=/var/run/upsd
+
+NUT_CONF_ENV = \
+ GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \
+ NET_SNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
+
+# For uClibc-based toolchains, nut forgets to link with -lm
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+NUT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lm"
+endif
+
+# All drivers without serial
+NUT_CONF_OPT += --without-serial
+NUT_CONF_OPT += --with-drivers=all
+
+ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS),yy)
+NUT_DEPENDENCIES += avahi dbus
+NUT_CONF_OPT += --with-avahi
+else
+NUT_CONF_OPT += --without-avahi
+endif
+
+# gd with support for png is required for the CGI
+ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
+NUT_DEPENDENCIES += gd libpng
+NUT_CONF_OPT += --with-cgi
+else
+NUT_CONF_OPT += --without-cgi
+endif
+
+# libltdl (libtool) is needed for nut-scanner
+ifeq ($(BR2_PACKAGE_LIBTOOL),y)
+NUT_DEPENDENCIES += libtool
+NUT_CONF_OPT += --with-libltdl
+else
+NUT_CONF_OPT += --without-libltdl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+NUT_DEPENDENCIES += libusb-compat
+NUT_CONF_OPT += --with-usb
+else
+NUT_CONF_OPT += --without-usb
+endif
+
+ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),y)
+NUT_DEPENDENCIES += neon
+NUT_CONF_OPT += --with-neon
+else
+NUT_CONF_OPT += --without-neon
+endif
+
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+NUT_DEPENDENCIES += netsnmp
+NUT_CONF_OPT += --with-snmp
+else
+NUT_CONF_OPT += --without-snmp
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+NUT_DEPENDENCIES += openssl
+NUT_CONF_OPT += --with-ssl
+else
+NUT_CONF_OPT += --without-ssl
+endif
+
+define NUT_INSTALL_SCRIPT
+ #$(INSTALL) -D -m 755 package/nut/upsd.init $(TARGET_DIR)/etc/init.d/upsd
+ mkdir -p $(TARGET_DIR)/stat/etc/upsd
+ for i in upsd.conf upsd.users ups.conf upsmon.conf upssched.conf; do \
+ mv $(TARGET_DIR)/etc/$$i.sample $(TARGET_DIR)/stat/etc/upsd/$$i ; \
+ ln -sf /tmp/etc/$$i $(TARGET_DIR)/etc/$$i ; \
+ done
+endef
+
+NUT_POST_INSTALL_TARGET_HOOKS += NUT_INSTALL_SCRIPT
+
+$(eval $(call AUTOTARGETS,package,nut))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-12-24 02:51:05 UTC (rev 6322)
+++ branches/1.0/runnix-uclibc.config 2013-12-25 20:15:21 UTC (rev 6323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6268-dirty Configuration
-# Wed Nov 13 09:15:22 2013
+# Buildroot 2011.08-svn6322-dirty Configuration
+# Wed Dec 25 14:09:54 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -913,6 +913,7 @@
# BR2_PACKAGE_NGREP is not set
# BR2_PACKAGE_NMAP is not set
# BR2_PACKAGE_NTP is not set
+# BR2_PACKAGE_NUT is not set
# BR2_PACKAGE_NUTTCP is not set
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-12-24 02:51:05 UTC (rev 6322)
+++ branches/1.0/runnix.config 2013-12-25 20:15:21 UTC (rev 6323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6268-dirty Configuration
-# Wed Nov 13 09:15:17 2013
+# Buildroot 2011.08-svn6322-dirty Configuration
+# Wed Dec 25 14:09:51 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -622,6 +622,7 @@
# BR2_PACKAGE_NGREP is not set
# BR2_PACKAGE_NMAP is not set
# BR2_PACKAGE_NTP is not set
+# BR2_PACKAGE_NUT is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENLDAP is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-12-26 21:55:32
|
Revision: 6325
http://sourceforge.net/p/astlinux/code/6325
Author: abelbeck
Date: 2013-12-26 21:55:27 +0000 (Thu, 26 Dec 2013)
Log Message:
-----------
Remove old Asterisk 1.4 bits and pieces, now clean Asterisk 1.8 and Asterisk 11 support
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
branches/1.0/package/asterisk/Config.in
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/asterisk-app_notify/Config.in
branches/1.0/package/asterisk-app_notify/asterisk-app_notify.mk
branches/1.0/package/spandsp/Config.in
branches/1.0/scripts/master-build
branches/1.0/scripts/master-upload
Added Paths:
-----------
branches/1.0/package/asterisk-app_notify/Makefile.module
Removed Paths:
-------------
branches/1.0/astlinux.config
branches/1.0/package/asterisk/Makefile.module
branches/1.0/package/asterisk/app_fax.c
branches/1.0/package/asterisk/app_pagecon.c
branches/1.0/package/asterisk/app_reload.c
branches/1.0/package/asterisk/asterisk-1.4-bugid11969.patch
branches/1.0/package/asterisk/asterisk-1.4-cflags.patch
branches/1.0/package/asterisk/asterisk-1.4-configure.patch
branches/1.0/package/asterisk/ilbc-codec-gcc-warning.patch
branches/1.0/package/asterisk/ilbc-codec.tar.gz
branches/1.0/package/asterisk/spandsp.patch
branches/1.0/package/asterisk-agi-audiotx/
branches/1.0/package/asterisk-app_nvfax/
branches/1.0/package/asterisk-app_waituntil/
branches/1.0/package/asterisk-func_devstate/
branches/1.0/package/asterisk-func_extstate/
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/astlinux-ast11.config 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6322-dirty Configuration
-# Wed Dec 25 14:09:50 2013
+# Buildroot 2011.08-svn6324-dirty Configuration
+# Thu Dec 26 12:28:02 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -156,8 +156,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_4 is not set
-# BR2_PACKAGE_ASTERISK_v1_6 is not set
# BR2_PACKAGE_ASTERISK_v1_8 is not set
BR2_PACKAGE_ASTERISK_v11=y
Deleted: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/astlinux.config 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,900 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6322-dirty Configuration
-# Wed Dec 25 14:09:47 2013
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_avr32 is not set
-# BR2_bfin is not set
-BR2_i386=y
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sh64 is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_xtensa is not set
-# BR2_x86_i386 is not set
-# BR2_x86_i486 is not set
-BR2_x86_i586=y
-# BR2_x86_i686 is not set
-# BR2_x86_pentiumpro is not set
-# BR2_x86_pentium_mmx is not set
-# BR2_x86_pentium_m is not set
-# BR2_x86_pentium2 is not set
-# BR2_x86_pentium3 is not set
-# BR2_x86_pentium4 is not set
-# BR2_x86_prescott is not set
-# BR2_x86_nocona is not set
-# BR2_x86_core2 is not set
-# BR2_x86_k6 is not set
-# BR2_x86_k6_2 is not set
-# BR2_x86_athlon is not set
-# BR2_x86_athlon_4 is not set
-# BR2_x86_opteron is not set
-# BR2_x86_opteron_sse3 is not set
-# BR2_x86_barcelona is not set
-# BR2_x86_geode is not set
-# BR2_x86_c3 is not set
-# BR2_x86_c32 is not set
-# BR2_x86_winchip_c6 is not set
-# BR2_x86_winchip2 is not set
-BR2_ARCH="i586"
-BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="i586"
-BR2_GCC_TARGET_ARCH="i586"
-
-#
-# Build options
-#
-
-#
-# Commands
-#
-BR2_WGET="toolchain/getter_script.sh"
-BR2_SVN="svn"
-BR2_BZR="bzr"
-BR2_GIT="git"
-BR2_ZCAT="gzip -d -c"
-BR2_BZCAT="bzcat"
-BR2_XZCAT="xzcat"
-BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(TOPDIR)/dl"
-BR2_HOST_DIR="$(BASE_DIR)/host"
-
-#
-# Mirrors and Download locations
-#
-BR2_PRIMARY_SITE=""
-BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="voxel"
-BR2_KERNEL_MIRROR="http://mirror.nexcess.net/kernel.org"
-BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
-BR2_DEBIAN_MIRROR="http://ftp.debian.org"
-BR2_JLEVEL=1
-# BR2_CCACHE is not set
-# BR2_DEPRECATED is not set
-# BR2_ENABLE_DEBUG is not set
-BR2_STRIP_strip=y
-# BR2_STRIP_sstrip is not set
-# BR2_STRIP_none is not set
-# BR2_OPTIMIZE_0 is not set
-# BR2_OPTIMIZE_1 is not set
-# BR2_OPTIMIZE_2 is not set
-# BR2_OPTIMIZE_3 is not set
-BR2_OPTIMIZE_S=y
-# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_DOCUMENTATION is not set
-# BR2_HAVE_DEVFILES is not set
-
-#
-# Toolchain
-#
-# BR2_TOOLCHAIN_BUILDROOT is not set
-BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_CTNG is not set
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools/i586-unknown-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
-# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC is not set
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-BR2_LARGEFILE=y
-BR2_INET_IPV6=y
-BR2_INET_RPC=y
-BR2_USE_WCHAR=y
-BR2_ENABLE_LOCALE=y
-BR2_INSTALL_LIBSTDCPP=y
-BR2_TOOLCHAIN_HAS_THREADS=y
-BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_USE_MMU=y
-BR2_TARGET_OPTIMIZATION="-pipe"
-BR2_TARGET_LDFLAGS=""
-
-#
-# System configuration
-#
-BR2_TARGET_GENERIC_HOSTNAME=""
-BR2_TARGET_GENERIC_ISSUE=""
-# BR2_ROOTFS_DEVICE_CREATION_STATIC is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
-BR2_ROOTFS_DEVICE_TABLE="project/astlinux/device_table.txt"
-# BR2_ROOTFS_SKELETON_DEFAULT is not set
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="project/astlinux/target_skeleton"
-BR2_ROOTFS_POST_BUILD_SCRIPT="scripts/astlinux-post-build"
-
-#
-# Package Selection for the target
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_16_X is not set
-# BR2_BUSYBOX_VERSION_1_17_X is not set
-BR2_BUSYBOX_VERSION_1_18_X=y
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.18.5"
-BR2_PACKAGE_BUSYBOX_CONFIG="project/astlinux/busybox.config"
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_CUSTOMIZE is not set
-
-#
-# Asterisk, XMPP and telephony applications
-#
-BR2_PACKAGE_ASTERISK=y
-BR2_PACKAGE_ASTERISK_v1_4=y
-# BR2_PACKAGE_ASTERISK_v1_6 is not set
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
-# BR2_PACKAGE_ASTERISK_v11 is not set
-
-#
-# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
-#
-
-#
-# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
-#
-# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-BR2_PACKAGE_ASTERISK_ILBC=y
-BR2_PACKAGE_ASTERISK-AGI-AUDIOTX=y
-BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
-BR2_PACKAGE_ASTERISK_APP_NVFAX=y
-BR2_PACKAGE_ASTERISK_APP_WAITUNTIL=y
-BR2_PACKAGE_ASTERISK_FUNC_DEVSTATE=y
-BR2_PACKAGE_ASTERISK_FUNC_EXTSTATE=y
-BR2_PACKAGE_ASTERISK_FOP2=y
-BR2_PACKAGE_ASTERISK_GUI=y
-BR2_PACKAGE_DAHDI_LINUX=y
-BR2_PACKAGE_DAHDI_OSLEC=y
-# BR2_PACKAGE_DAHDI_HFCS is not set
-# BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE is not set
-BR2_PACKAGE_DAHDI_TOOLS=y
-# BR2_PACKAGE_FONULATOR is not set
-# BR2_PACKAGE_FREESWITCH is not set
-BR2_PACKAGE_CLIX=y
-BR2_PACKAGE_PROSODY=y
-BR2_PACKAGE_RHINO=y
-BR2_PACKAGE_WANPIPE=y
-
-#
-# Audio and video libraries and applications
-#
-# BR2_PACKAGE_ALSA_LIB is not set
-# BR2_PACKAGE_ALSA_UTILS is not set
-# BR2_PACKAGE_AUMIX is not set
-BR2_PACKAGE_BEEP=y
-# BR2_PACKAGE_FAAD2 is not set
-# BR2_PACKAGE_FLAC is not set
-# BR2_PACKAGE_FFMPEG is not set
-# BR2_PACKAGE_GSTREAMER is not set
-# BR2_PACKAGE_LAME is not set
-# BR2_PACKAGE_LIBAO is not set
-# BR2_PACKAGE_LIBCDAUDIO is not set
-# BR2_PACKAGE_LIBCUE is not set
-# BR2_PACKAGE_LIBCUEFILE is not set
-# BR2_PACKAGE_LIBDVDREAD is not set
-# BR2_PACKAGE_LIBDVDNAV is not set
-# BR2_PACKAGE_LIBID3TAG is not set
-BR2_PACKAGE_LIBMAD=y
-# BR2_PACKAGE_LIBMMS is not set
-# BR2_PACKAGE_LIBMPD is not set
-# BR2_PACKAGE_LIBMPEG2 is not set
-# BR2_PACKAGE_LIBOGG is not set
-# BR2_PACKAGE_LIBREPLAYGAIN is not set
-# BR2_PACKAGE_LIBSAMPLERATE is not set
-# BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set
-# BR2_PACKAGE_LIBVORBIS is not set
-# BR2_PACKAGE_LIVE555 is not set
-# BR2_PACKAGE_MADPLAY is not set
-# BR2_PACKAGE_MPD is not set
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
-# BR2_PACKAGE_MUSEPACK is not set
-BR2_PACKAGE_SOX=y
-BR2_PACKAGE_SOX_LIBMAD=y
-# BR2_PACKAGE_SPEEX is not set
-# BR2_PACKAGE_TAGLIB is not set
-# BR2_PACKAGE_TREMOR is not set
-# BR2_PACKAGE_VORBIS_TOOLS is not set
-# BR2_PACKAGE_WAVPACK is not set
-
-#
-# Compressors and decompressors
-#
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_XZ is not set
-
-#
-# Debugging, profiling and benchmark
-#
-# BR2_PACKAGE_BONNIE is not set
-# BR2_PACKAGE_DHRYSTONE is not set
-# BR2_PACKAGE_DMALLOC is not set
-BR2_PACKAGE_KEXEC=y
-# BR2_PACKAGE_KEXEC_ZLIB is not set
-# BR2_PACKAGE_LMBENCH is not set
-# BR2_PACKAGE_LSOF is not set
-# BR2_PACKAGE_LTP_TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_NETPERF is not set
-BR2_PACKAGE_STRACE=y
-# BR2_PACKAGE_WHETSTONE is not set
-# BR2_PACKAGE_VALGRIND is not set
-
-#
-# Development tools
-#
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CCACHE is not set
-# BR2_PACKAGE_CVS is not set
-# BR2_PACKAGE_DISTCC is not set
-BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
-# BR2_PACKAGE_GMP is not set
-# BR2_PACKAGE_GPERF is not set
-# BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_MPC is not set
-# BR2_PACKAGE_MPFR is not set
-BR2_PACKAGE_LIBTOOL=y
-# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_PKG_CONFIG is not set
-# BR2_PACKAGE_SSTRIP is not set
-
-#
-# Games
-#
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_PRBOOM is not set
-
-#
-# Graphic libraries and applications (graphic/text)
-#
-
-#
-# Graphic applications
-#
-# BR2_PACKAGE_RRDTOOL is not set
-
-#
-# graphic libraries
-#
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_FBGRAB is not set
-# BR2_PACKAGE_FBV is not set
-# BR2_PACKAGE_IMAGEMAGICK is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
-
-#
-# other GUIs
-#
-# BR2_PACKAGE_QT is not set
-
-#
-# X libraries and helper libraries
-#
-# BR2_PACKAGE_LIBERATION is not set
-
-#
-# X Window managers
-#
-
-#
-# X applications
-#
-# BR2_PACKAGE_GOB2 is not set
-
-#
-# midori requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-BR2_PACKAGE_ACPID=y
-BR2_PACKAGE_BFDETECT=y
-# BR2_PACKAGE_CDRKIT is not set
-# BR2_PACKAGE_CRAMFS is not set
-# BR2_PACKAGE_DBUS is not set
-# BR2_PACKAGE_DMRAID is not set
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-BR2_PACKAGE_E1000=y
-BR2_PACKAGE_E1000E=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
-BR2_PACKAGE_E2FSPROGS_CHATTR=y
-# BR2_PACKAGE_E2FSPROGS_DEBUGFS is not set
-BR2_PACKAGE_E2FSPROGS_DUMPE2FS=y
-BR2_PACKAGE_E2FSPROGS_E2FREEFRAG=y
-BR2_PACKAGE_E2FSPROGS_E2FSCK=y
-# BR2_PACKAGE_E2FSPROGS_E2IMAGE is not set
-BR2_PACKAGE_E2FSPROGS_E2LABEL=y
-BR2_PACKAGE_E2FSPROGS_E2UNDO=y
-BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FSCK=y
-BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
-BR2_PACKAGE_E2FSPROGS_LSATTR=y
-BR2_PACKAGE_E2FSPROGS_MKE2FS=y
-BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
-# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
-BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-# BR2_PACKAGE_EEPROG is not set
-# BR2_PACKAGE_FCONFIG is not set
-# BR2_PACKAGE_FIS is not set
-BR2_PACKAGE_FXLOAD=y
-# BR2_PACKAGE_GADGETFS_TEST is not set
-# BR2_PACKAGE_GDISK is not set
-# BR2_PACKAGE_GENEXT2FS is not set
-# BR2_PACKAGE_GENROMFS is not set
-# BR2_PACKAGE_GPSD is not set
-# BR2_PACKAGE_GVFS is not set
-# BR2_PACKAGE_HWDATA is not set
-# BR2_PACKAGE_I2C_TOOLS is not set
-# BR2_PACKAGE_INPUT_EVENT_DAEMON is not set
-# BR2_PACKAGE_INPUT_TOOLS is not set
-# BR2_PACKAGE_IOSTAT is not set
-# BR2_PACKAGE_IRDA_UTILS is not set
-# BR2_PACKAGE_KBD is not set
-# BR2_PACKAGE_LIBV4L is not set
-BR2_PACKAGE_LM_SENSORS=y
-
-#
-# lm-sensors tools
-#
-BR2_PACKAGE_LM_SENSORS_SENSORS=y
-# BR2_PACKAGE_LM_SENSORS_FANCONTROL is not set
-# BR2_PACKAGE_LM_SENSORS_ISADUMP is not set
-# BR2_PACKAGE_LM_SENSORS_ISASET is not set
-# BR2_PACKAGE_LM_SENSORS_PWMCONFIG is not set
-# BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT is not set
-# BR2_PACKAGE_LSUIO is not set
-# BR2_PACKAGE_LVM2 is not set
-# BR2_PACKAGE_MAKEDEVS is not set
-# BR2_PACKAGE_MDADM is not set
-# BR2_PACKAGE_MEMTEST is not set
-# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MTD is not set
-# BR2_PACKAGE_NTFS_3G is not set
-# BR2_PACKAGE_NTFSPROGS is not set
-BR2_PACKAGE_PCIUTILS=y
-BR2_PACKAGE_R8168=y
-# BR2_PACKAGE_RNG_TOOLS is not set
-# BR2_PACKAGE_SDPARM is not set
-# BR2_PACKAGE_SETSERIAL is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
-# BR2_PACKAGE_SQUASHFS is not set
-# BR2_PACKAGE_SREDIRD is not set
-# BR2_PACKAGE_SSHFS is not set
-BR2_PACKAGE_STATSERIAL=y
-# BR2_PACKAGE_SYSSTAT is not set
-BR2_PACKAGE_TG3=y
-# BR2_PACKAGE_TI_UTILS is not set
-# BR2_PACKAGE_UBOOT_TOOLS is not set
-BR2_PACKAGE_UDEV=y
-# BR2_PACKAGE_UDEV_ALL_EXTRAS is not set
-# BR2_PACKAGE_USB_MODESWITCH is not set
-# BR2_PACKAGE_USBMOUNT is not set
-BR2_PACKAGE_USBUTILS=y
-# BR2_PACKAGE_USBUTILS_ZLIB is not set
-# BR2_PACKAGE_WIPE is not set
-# BR2_PACKAGE_XFSPROGS is not set
-BR2_PACKAGE_ZABBIX=y
-BR2_PACKAGE_ZABBIX_PROXY=y
-
-#
-# Interpreter languages and scripting
-#
-BR2_PACKAGE_BC=y
-# BR2_PACKAGE_HASERL is not set
-BR2_PACKAGE_LUA=y
-
-#
-# LUA libraries/modules
-#
-# BR2_PACKAGE_CGILUA is not set
-# BR2_PACKAGE_COPAS is not set
-# BR2_PACKAGE_COXPCALL is not set
-BR2_PACKAGE_LUAEXPAT=y
-BR2_PACKAGE_LUAFILESYSTEM=y
-BR2_PACKAGE_LUASEC=y
-BR2_PACKAGE_LUASOCKET=y
-# BR2_PACKAGE_WSAPI is not set
-# BR2_PACKAGE_XAVANTE is not set
-BR2_PACKAGE_PERL=y
-BR2_PACKAGE_PHP=y
-BR2_PACKAGE_PHP_CGI=y
-# BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
-# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
-
-#
-# PHP Extensions
-#
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
-# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
-BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
-BR2_PACKAGE_PHP_EXT_SESSION=y
-BR2_PACKAGE_PHP_EXT_OPENSSL=y
-# BR2_PACKAGE_PHP_EXT_CURL is not set
-BR2_PACKAGE_PHP_EXT_LIBXML2=y
-BR2_PACKAGE_PHP_EXT_XMLPARSER=y
-# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
-BR2_PACKAGE_PHP_EXT_ZLIB=y
-# BR2_PACKAGE_PHP_EXT_EXIF is not set
-# BR2_PACKAGE_PHP_EXT_FTP is not set
-# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
-# BR2_PACKAGE_PHP_EXT_GMP is not set
-BR2_PACKAGE_PHP_EXT_JSON=y
-# BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
-# BR2_PACKAGE_PHP_EXT_PCNTL is not set
-# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
-# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
-# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
-BR2_PACKAGE_PHP_EXT_ZIP=y
-BR2_PACKAGE_PHP_EXT_FILTER=y
-# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
-
-#
-# Database extensions
-#
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
-BR2_PACKAGE_PHP_EXT_PDO=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
-# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_TCL is not set
-BR2_PACKAGE_WEBINTERFACE=y
-# BR2_PACKAGE_WEBINTERFACE_v1 is not set
-BR2_PACKAGE_WEBINTERFACE_v2=y
-
-#
-# Libraries
-#
-
-#
-# Compression and decompression
-#
-# BR2_PACKAGE_LIBARCHIVE is not set
-BR2_PACKAGE_LZO=y
-BR2_PACKAGE_SPANDSP=y
-# BR2_PACKAGE_SPANDSP_APP_FAX is not set
-BR2_PACKAGE_ZLIB=y
-
-#
-# Crypto
-#
-# BR2_PACKAGE_BEECRYPT is not set
-# BR2_PACKAGE_GNUTLS is not set
-# BR2_PACKAGE_LIBGCRYPT is not set
-# BR2_PACKAGE_LIBGPG_ERROR is not set
-# BR2_PACKAGE_LIBNSS is not set
-BR2_PACKAGE_OPENSSL=y
-BR2_PACKAGE_OPENSSL_BIN=y
-BR2_PACKAGE_OPENSSL_ENGINES=y
-# BR2_PACKAGE_OPENSSL_OCF is not set
-# BR2_PACKAGE_LIBSRTP is not set
-
-#
-# Database
-#
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
-# BR2_PACKAGE_SQLITEODBC is not set
-# BR2_PACKAGE_UNIXODBC is not set
-
-#
-# Filesystem
-#
-# BR2_PACKAGE_GAMIN is not set
-# BR2_PACKAGE_LIBCONFIG is not set
-# BR2_PACKAGE_LIBCONFUSE is not set
-# BR2_PACKAGE_LIBFUSE is not set
-# BR2_PACKAGE_LIBLOCKFILE is not set
-BR2_PACKAGE_LIBSYSFS=y
-
-#
-# Graphics
-#
-# BR2_PACKAGE_ATK is not set
-# BR2_PACKAGE_CAIRO is not set
-# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-BR2_PACKAGE_JPEG=y
-# BR2_PACKAGE_LIBART is not set
-# BR2_PACKAGE_LIBEXIF is not set
-# BR2_PACKAGE_GDK_PIXBUF is not set
-# BR2_PACKAGE_LIBPNG is not set
-# BR2_PACKAGE_LIBRAW is not set
-# BR2_PACKAGE_LIBSVGTINY is not set
-# BR2_PACKAGE_LIBUNGIF is not set
-# BR2_PACKAGE_PANGO is not set
-# BR2_PACKAGE_PIXMAN is not set
-BR2_PACKAGE_TIFF=y
-
-#
-# webkit requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
-# BR2_PACKAGE_TSLIB is not set
-# BR2_PACKAGE_LIBHID is not set
-# BR2_PACKAGE_LIBIQRF is not set
-BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_LIBUSB_COMPAT=y
-
-#
-# Networking
-#
-# BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_LIBEXOSIP2 is not set
-BR2_PACKAGE_LIBIDN=y
-# BR2_PACKAGE_LIBIDN_BINARY is not set
-# BR2_PACKAGE_LIBMICROHTTPD is not set
-# BR2_PACKAGE_NEON is not set
-# BR2_PACKAGE_LIBMNL is not set
-# BR2_PACKAGE_LIBNET is not set
-# BR2_PACKAGE_LIBNL is not set
-BR2_PACKAGE_LIBPCAP=y
-# BR2_PACKAGE_LIBOSIP2 is not set
-BR2_PACKAGE_LIBPRI=y
-# BR2_PACKAGE_LIBRSYNC is not set
-# BR2_PACKAGE_LIBSOUP is not set
-# BR2_PACKAGE_LIBUPNP is not set
-BR2_PACKAGE_LINUX_ATM=y
-
-#
-# Other
-#
-# BR2_PACKAGE_LIBARGTABLE2 is not set
-# BR2_PACKAGE_ARGP_STANDALONE is not set
-# BR2_PACKAGE_LIBATOMIC_OPS is not set
-# BR2_PACKAGE_LIBCAP is not set
-BR2_PACKAGE_LIBDAEMON=y
-BR2_PACKAGE_LIBELF=y
-# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBFB is not set
-# BR2_PACKAGE_LIBFFI is not set
-# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_LIBICAL is not set
-# BR2_PACKAGE_LIBNSPR is not set
-# BR2_PACKAGE_LIBSIGC is not set
-# BR2_PACKAGE_ORC is not set
-
-#
-# Text and terminal handling
-#
-# BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_ICU is not set
-BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
-BR2_PACKAGE_NEWT=y
-BR2_PACKAGE_PCRE=y
-BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
-BR2_PACKAGE_SLANG=y
-
-#
-# JSON/XML
-#
-BR2_PACKAGE_EXPAT=y
-# BR2_PACKAGE_EZXML is not set
-BR2_PACKAGE_IKSEMEL=y
-# BR2_PACKAGE_LIBROXML is not set
-BR2_PACKAGE_LIBXML2=y
-# BR2_PACKAGE_LIBXSLT is not set
-# BR2_PACKAGE_LIBYAML is not set
-# BR2_PACKAGE_MXML is not set
-# BR2_PACKAGE_XERCES is not set
-# BR2_PACKAGE_YAJL is not set
-
-#
-# Miscellaneous
-#
-BR2_PACKAGE_HTPASSWD=y
-BR2_PACKAGE_MAC2VENDOR=y
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-BR2_PACKAGE_ZONEINFO=y
-
-#
-# Networking applications
-#
-BR2_PACKAGE_APCUPSD=y
-# BR2_PACKAGE_ARGUS is not set
-BR2_PACKAGE_ARNOFW=y
-# BR2_PACKAGE_AVAHI is not set
-# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BLUEZ_UTILS is not set
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BMON is not set
-BR2_PACKAGE_BRIDGE=y
-# BR2_PACKAGE_BWM_NG is not set
-# BR2_PACKAGE_CAN_UTILS is not set
-# BR2_PACKAGE_CTORRENT is not set
-# BR2_PACKAGE_CUPS is not set
-BR2_PACKAGE_DARKSTAT=y
-BR2_PACKAGE_DHCPDUMP=y
-BR2_PACKAGE_DNSMASQ=y
-BR2_PACKAGE_DNSMASQ_TFTP=y
-BR2_PACKAGE_DNSMASQ_DHCP=y
-# BR2_PACKAGE_DNSMASQ_IDN is not set
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_EBTABLES is not set
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_FPING=y
-# BR2_PACKAGE_HOSTAPD is not set
-# BR2_PACKAGE_IFPLUGD is not set
-BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPSEC_TOOLS=y
-BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
-BR2_PACKAGE_IPSEC_TOOLS_NATT=y
-BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
-# BR2_PACKAGE_IPSEC_TOOLS_STATS is not set
-# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
-BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
-# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
-# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
-BR2_PACKAGE_IPTABLES=y
-# BR2_PACKAGE_IW is not set
-# BR2_PACKAGE_KISMET is not set
-# BR2_PACKAGE_XL2TP is not set
-BR2_PACKAGE_LIGHTTPD=y
-BR2_PACKAGE_LIGHTTPD_OPENSSL=y
-# BR2_PACKAGE_LIGHTTPD_ZLIB is not set
-# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
-BR2_PACKAGE_LIGHTTPD_PCRE=y
-# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
-BR2_PACKAGE_LINKS=y
-# BR2_PACKAGE_LINKS_GRAPHICS is not set
-# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
-# BR2_PACKAGE_MII_DIAG is not set
-BR2_PACKAGE_MINIUPNPD=y
-# BR2_PACKAGE_MROUTED is not set
-BR2_PACKAGE_MSMTP=y
-BR2_PACKAGE_MTR=y
-# BR2_PACKAGE_MUTT is not set
-# BR2_PACKAGE_NBD is not set
-# BR2_PACKAGE_NCFTP is not set
-# BR2_PACKAGE_NETPLUG is not set
-BR2_PACKAGE_NETSNMP=y
-# BR2_PACKAGE_NETSTAT_NAT is not set
-# BR2_PACKAGE_NFS_UTILS is not set
-# BR2_PACKAGE_NGIRCD is not set
-BR2_PACKAGE_NGREP=y
-# BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
-# BR2_PACKAGE_NUT is not set
-# BR2_PACKAGE_NUTTCP is not set
-# BR2_PACKAGE_OLSR is not set
-BR2_PACKAGE_OPENLDAP=y
-BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
-BR2_PACKAGE_OPENSSH=y
-BR2_PACKAGE_OPENVPN=y
-BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
-BR2_PACKAGE_P910ND=y
-# BR2_PACKAGE_PORTMAP is not set
-BR2_PACKAGE_PPPD=y
-# BR2_PACKAGE_PPPD_FILTER is not set
-# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
-BR2_PACKAGE_RP_PPPOE=y
-# BR2_PACKAGE_PPTP_LINUX is not set
-BR2_PACKAGE_PPTPD=y
-# BR2_PACKAGE_PROFTPD is not set
-# BR2_PACKAGE_QUAGGA is not set
-# BR2_PACKAGE_RSH_REDONE is not set
-BR2_PACKAGE_RSYNC=y
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SER2NET is not set
-BR2_PACKAGE_SHELLINABOX=y
-# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SPAWN_FCGI is not set
-# BR2_PACKAGE_SQUID is not set
-BR2_PACKAGE_STUNNEL=y
-BR2_PACKAGE_TCPDUMP=y
-# BR2_PACKAGE_TCPDUMP_SMB is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TINYPROXY is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-# BR2_PACKAGE_UDPCAST is not set
-# BR2_PACKAGE_UW_IMAP is not set
-# BR2_PACKAGE_VPNC is not set
-BR2_PACKAGE_VSFTPD=y
-# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
-
-#
-# Package managers
-#
-# BR2_PACKAGE_IPKG is not set
-
-#
-# Shell and utilities
-#
-# BR2_PACKAGE_AT is not set
-BR2_PACKAGE_BASH=y
-BR2_PACKAGE_DIALOG=y
-# BR2_PACKAGE_FILE is not set
-# BR2_PACKAGE_INOTIFY_TOOLS is not set
-# BR2_PACKAGE_LOCKFILE_PROGS is not set
-BR2_PACKAGE_LOGROTATE=y
-BR2_PACKAGE_SCREEN=y
-BR2_PACKAGE_SUDO=y
-# BR2_PACKAGE_WHICH is not set
-# BR2_PACKAGE_XMLSTARLET is not set
-
-#
-# System tools
-#
-# BR2_PACKAGE_ACL is not set
-# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
-BR2_PACKAGE_MODULE_INIT_TOOLS=y
-BR2_PACKAGE_UTIL_LINUX=y
-# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
-# BR2_PACKAGE_UTIL_LINUX_FSCK is not set
-# BR2_PACKAGE_UTIL_LINUX_LIBMOUNT is not set
-BR2_PACKAGE_UTIL_LINUX_LIBUUID=y
-# BR2_PACKAGE_UTIL_LINUX_UUIDD is not set
-BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
-# BR2_PACKAGE_UTIL_LINUX_AGETTY is not set
-# BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set
-# BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set
-# BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set
-# BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set
-# BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set
-# BR2_PACKAGE_UTIL_LINUX_RENAME is not set
-BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
-# BR2_PACKAGE_UTIL_LINUX_WALL is not set
-# BR2_PACKAGE_UTIL_LINUX_ARCH is not set
-# BR2_PACKAGE_UTIL_LINUX_INIT is not set
-# BR2_PACKAGE_UTIL_LINUX_KILL is not set
-# BR2_PACKAGE_UTIL_LINUX_LAST is not set
-# BR2_PACKAGE_UTIL_LINUX_MESG is not set
-# BR2_PACKAGE_UTIL_LINUX_PARTX is not set
-# BR2_PACKAGE_UTIL_LINUX_RAW is not set
-# BR2_PACKAGE_UTIL_LINUX_RESET is not set
-# BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set
-# BR2_PACKAGE_UTIL_LINUX_WRITE is not set
-
-#
-# Text editors and viewers
-#
-# BR2_PACKAGE_ED is not set
-BR2_PACKAGE_EX_VI=y
-BR2_PACKAGE_NANO=y
-# BR2_PACKAGE_UEMACS is not set
-
-#
-# Filesystem images
-#
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
-BR2_TARGET_ROOTFS_EXT2_INODES=0
-BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
-BR2_TARGET_ROOTFS_EXT2_NONE=y
-# BR2_TARGET_ROOTFS_EXT2_GZIP is not set
-# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
-# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-# BR2_TARGET_ROOTFS_JFFS2 is not set
-# BR2_TARGET_ROOTFS_UBIFS is not set
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4=y
-BR2_TARGET_ROOTFS_SQUASHFS4_GZIP=y
-# BR2_TARGET_ROOTFS_SQUASHFS4_LZMA is not set
-# BR2_TARGET_ROOTFS_SQUASHFS4_LZO is not set
-# BR2_TARGET_ROOTFS_SQUASHFS4_XZ is not set
-# BR2_TARGET_ROOTFS_TAR is not set
-# BR2_TARGET_ROOTFS_CPIO is not set
-# BR2_TARGET_ROOTFS_ISO9660 is not set
-# BR2_TARGET_ROOTFS_INITRAMFS is not set
-# BR2_TARGET_ROOTFS_ROMFS is not set
-
-#
-# Bootloaders
-#
-# BR2_TARGET_BAREBOX is not set
-# BR2_TARGET_GRUB is not set
-# BR2_TARGET_SYSLINUX is not set
-BR2_TARGET_RUNNIX=y
-BR2_TARGET_RUNNIX_NDEV=""
-# BR2_TARGET_UBOOT is not set
-
-#
-# Kernel
-#
-BR2_LINUX_KERNEL=y
-# BR2_LINUX_KERNEL_2_6_39 is not set
-# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
-BR2_LINUX_KERNEL_VERSION="custom"
-BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
-# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="project/astlinux/geni586/linux.config"
-BR2_LINUX_KERNEL_BZIMAGE=y
-# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/astlinux18.config 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6322-dirty Configuration
-# Wed Dec 25 14:09:48 2013
+# Buildroot 2011.08-svn6324-dirty Configuration
+# Thu Dec 26 12:28:02 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -156,8 +156,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_4 is not set
-# BR2_PACKAGE_ASTERISK_v1_6 is not set
BR2_PACKAGE_ASTERISK_v1_8=y
# BR2_PACKAGE_ASTERISK_v11 is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/Config.in 2013-12-26 21:55:27 UTC (rev 6325)
@@ -5,13 +5,8 @@
menu "Asterisk, XMPP and telephony applications"
source "package/asterisk/Config.in"
-source "package/asterisk-agi-audiotx/Config.in"
source "package/asterisk-app_notify/Config.in"
-source "package/asterisk-app_nvfax/Config.in"
-source "package/asterisk-app_waituntil/Config.in"
source "package/asterisk-codec-silk/Config.in"
-source "package/asterisk-func_devstate/Config.in"
-source "package/asterisk-func_extstate/Config.in"
source "package/asterisk-fop2/Config.in"
source "package/asterisk-gui/Config.in"
source "package/dahdi-linux/Config.in"
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/asterisk/Config.in 2013-12-26 21:55:27 UTC (rev 6325)
@@ -14,20 +14,10 @@
choice
prompt "Asterisk Version"
depends on BR2_PACKAGE_ASTERISK
- default BR2_PACKAGE_ASTERISK_v1_4
+ default BR2_PACKAGE_ASTERISK_v1_8
help
Select which version of Asterisk to compile and install.
- config BR2_PACKAGE_ASTERISK_v1_4
- bool "Asterisk v1.4.x"
- help
- Asterisk Long Term Stable Release.
-
- config BR2_PACKAGE_ASTERISK_v1_6
- bool "Asterisk v1.6.x"
- help
- Deprecated Branch
-
config BR2_PACKAGE_ASTERISK_v1_8
bool "Asterisk v1.8.x"
help
@@ -56,12 +46,3 @@
help
Run interactive menuselect to select custom Asterisk options
-config BR2_PACKAGE_ASTERISK_ILBC
- bool "Asterisk iLBC CODEC"
- default n
- depends on BR2_PACKAGE_ASTERISK && (BR2_PACKAGE_ASTERISK_v1_4 || BR2_PACKAGE_ASTERISK_v1_6)
- help
- iLBC CODEC for Asterisk
-
- http://www.ietf.org/rfc/rfc3951.txt
-
Deleted: branches/1.0/package/asterisk/Makefile.module
===================================================================
--- branches/1.0/package/asterisk/Makefile.module 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/asterisk/Makefile.module 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,43 +0,0 @@
-#
-# Taken from:
-#
-# http://s...
[truncated message content] |
|
From: <abe...@us...> - 2014-01-02 15:54:28
|
Revision: 6332
http://sourceforge.net/p/astlinux/code/6332
Author: abelbeck
Date: 2014-01-02 15:54:25 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
apcupsd, allow to coexist with nut or not built if desired
Modified Paths:
--------------
branches/1.0/package/apcupsd/apcupsd.init
branches/1.0/package/apcupsd/apcupsd.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd
Modified: branches/1.0/package/apcupsd/apcupsd.init
===================================================================
--- branches/1.0/package/apcupsd/apcupsd.init 2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/package/apcupsd/apcupsd.init 2014-01-02 15:54:25 UTC (rev 6332)
@@ -1,5 +1,10 @@
#!/bin/sh
+# Disable if ups or upsmon is running
+if [ -f /var/run/ups/upsd.pid -o -f /var/run/upsmon.pid ]; then
+ exit 0
+fi
+
. /etc/rc.conf
MANUAL_CONF="/mnt/kd/apcupsd/apcupsd.conf"
Modified: branches/1.0/package/apcupsd/apcupsd.mk
===================================================================
--- branches/1.0/package/apcupsd/apcupsd.mk 2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/package/apcupsd/apcupsd.mk 2014-01-02 15:54:25 UTC (rev 6332)
@@ -62,12 +62,16 @@
#
$(INSTALL) -D -m 0755 package/apcupsd/apcupsd.init $(TARGET_DIR)/etc/init.d/apcupsd
ln -sf /tmp/etc/apcupsd $(TARGET_DIR)/etc/apcupsd
+ ln -sf ../../init.d/apcupsd $(TARGET_DIR)/etc/runlevels/default/S35apcupsd
+ ln -sf ../../init.d/apcupsd $(TARGET_DIR)/etc/runlevels/default/K21apcupsd
apcupsd: $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
apcupsd-source: $(APCUPSD_DIR)/.unpacked
apcupsd-clean:
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S35apcupsd
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K21apcupsd
$(MAKE1) -C $(APCUPSD_DIR) uninstall DESTDIR=$(TARGET_DIR)
-$(MAKE) -C $(APCUPSD_DIR) clean DESTDIR=$(TARGET_DIR)
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd 2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd 2014-01-02 15:54:25 UTC (rev 6332)
@@ -1 +0,0 @@
-link ../../init.d/apcupsd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd 2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd 2014-01-02 15:54:25 UTC (rev 6332)
@@ -1 +0,0 @@
-link ../../init.d/apcupsd
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-01-03 20:13:13
|
Revision: 6339
http://sourceforge.net/p/astlinux/code/6339
Author: abelbeck
Date: 2014-01-03 20:13:10 +0000 (Fri, 03 Jan 2014)
Log Message:
-----------
change default builds from using 'apcupsd' to 'nut' for UPS monitoring
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-01-03 19:58:27 UTC (rev 6338)
+++ branches/1.0/astlinux-ast11.config 2014-01-03 20:13:10 UTC (rev 6339)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6324-dirty Configuration
-# Thu Dec 26 12:28:02 2013
+# Buildroot 2011.08-svn6338-dirty Configuration
+# Fri Jan 3 14:07:43 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -656,7 +656,7 @@
#
# Networking applications
#
-BR2_PACKAGE_APCUPSD=y
+# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
@@ -734,7 +734,8 @@
BR2_PACKAGE_NTP_NTPQ=y
# BR2_PACKAGE_NTP_NTPTRACE is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
-# BR2_PACKAGE_NUT is not set
+BR2_PACKAGE_NUT=y
+# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-01-03 19:58:27 UTC (rev 6338)
+++ branches/1.0/astlinux18.config 2014-01-03 20:13:10 UTC (rev 6339)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6324-dirty Configuration
-# Thu Dec 26 12:28:02 2013
+# Buildroot 2011.08-svn6338 Configuration
+# Fri Jan 3 14:06:55 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -656,7 +656,7 @@
#
# Networking applications
#
-BR2_PACKAGE_APCUPSD=y
+# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
@@ -734,7 +734,8 @@
BR2_PACKAGE_NTP_NTPQ=y
# BR2_PACKAGE_NTP_NTPTRACE is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
-# BR2_PACKAGE_NUT is not set
+BR2_PACKAGE_NUT=y
+# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-01-22 22:17:58
|
Revision: 6372
http://sourceforge.net/p/astlinux/code/6372
Author: abelbeck
Date: 2014-01-22 22:17:54 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
crosstool-ng version bump to 1.19.0 with gcc 4.4.7 and eglibc 2.15
Busybox version bump to 1.19.4
Note: toolchain is created in $HOME/astlinux/x-tools-1.19.0/ and custom .config files need to be adjusted to use the new toolchain as per the default .config's
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/crosstool-ng-src/README
branches/1.0/initrd.config
branches/1.0/package/busybox/Config.in
branches/1.0/package/busybox/busybox-utmp-no-touch.patch
branches/1.0/package/busybox/busybox.mk
branches/1.0/package/darkstat/darkstat.mk
branches/1.0/package/kexec/kexec.mk
branches/1.0/package/vsftpd/vsftpd.mk
branches/1.0/project/astlinux/busybox.config
branches/1.0/project/initrd/busybox.config
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
branches/1.0/scripts/build
Added Paths:
-----------
branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config
Removed Paths:
-------------
branches/1.0/crosstool-ng-src/ct-ng.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-01-19 20:07:18 UTC (rev 6371)
+++ branches/1.0/astlinux-ast11.config 2014-01-22 22:17:54 UTC (rev 6372)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6338-dirty Configuration
-# Fri Jan 3 14:07:43 2014
+# Buildroot 2011.08-svn6371-dirty Configuration
+# Mon Jan 20 14:49:32 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -71,7 +71,7 @@
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
BR2_SOURCEFORGE_MIRROR="voxel"
-BR2_KERNEL_MIRROR="http://mirror.nexcess.net/kernel.org"
+BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
BR2_JLEVEL=1
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
@@ -145,9 +145,10 @@
BR2_PACKAGE_BUSYBOX=y
# BR2_BUSYBOX_VERSION_1_16_X is not set
# BR2_BUSYBOX_VERSION_1_17_X is not set
-BR2_BUSYBOX_VERSION_1_18_X=y
+# BR2_BUSYBOX_VERSION_1_18_X is not set
+BR2_BUSYBOX_VERSION_1_19_X=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.18.5"
+BR2_BUSYBOX_VERSION="1.19.4"
BR2_PACKAGE_BUSYBOX_CONFIG="project/astlinux/busybox.config"
# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
# BR2_PACKAGE_CUSTOMIZE is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-01-19 20:07:18 UTC (rev 6371)
+++ branches/1.0/astlinux18.config 2014-01-22 22:17:54 UTC (rev 6372)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6338 Configuration
-# Fri Jan 3 14:06:55 2014
+# Buildroot 2011.08-svn6371-dirty Configuration
+# Mon Jan 20 14:49:27 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -71,7 +71,7 @@
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
BR2_SOURCEFORGE_MIRROR="voxel"
-BR2_KERNEL_MIRROR="http://mirror.nexcess.net/kernel.org"
+BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
BR2_JLEVEL=1
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
@@ -145,9 +145,10 @@
BR2_PACKAGE_BUSYBOX=y
# BR2_BUSYBOX_VERSION_1_16_X is not set
# BR2_BUSYBOX_VERSION_1_17_X is not set
-BR2_BUSYBOX_VERSION_1_18_X=y
+# BR2_BUSYBOX_VERSION_1_18_X is not set
+BR2_BUSYBOX_VERSION_1_19_X=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.18.5"
+BR2_BUSYBOX_VERSION="1.19.4"
BR2_PACKAGE_BUSYBOX_CONFIG="project/astlinux/busybox.config"
# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
# BR2_PACKAGE_CUSTOMIZE is not set
Modified: branches/1.0/crosstool-ng-src/README
===================================================================
--- branches/1.0/crosstool-ng-src/README 2014-01-19 20:07:18 UTC (rev 6371)
+++ branches/1.0/crosstool-ng-src/README 2014-01-22 22:17:54 UTC (rev 6372)
@@ -1,28 +1,29 @@
#########################################################################
-## Crosstool-NG
+## Crosstool-NG 1.19.0
## http://crosstool-ng.org
##
-## Building the eglibc toolchain for AstLinux 1.x using Buildroot 2011-08
-## The resulting toolchain is output to $HOME/astlinux/x-tools
+## Building the eglibc toolchain for AstLinux 1.x using Buildroot
+## The resulting toolchain is output to $HOME/astlinux/x-tools-1.19.0
## Make sure you have a $HOME/astlinux/ directory.
##
# mkdir ~/source-control # used as example folder for these configs
cd ~/source-control
-wget -O - http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.12.3.tar.bz2 | tar xj
-cd crosstool-ng-1.12.3
+wget -O - http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.19.0.tar.bz2 | tar xj
+cd crosstool-ng-1.19.0
./configure
+# Note: the 'gperf' package may need to be added to your system.
make
sudo make install
cd ~/source-control
-mkdir ctng
-cd ctng
-# then copy the "crosstool-ng-src/ct-ng.config" file from the SVN to ".config" here
-cp ~/astlinux/1.0/crosstool-ng-src/ct-ng.config .config
+mkdir ctng-1.19.0
+cd ctng-1.19.0
+# then copy the "crosstool-ng-src/ct-ng-1.19.0.config" file from the SVN to ".config" here
+cp ~/astlinux/1.0/crosstool-ng-src/ct-ng-1.19.0.config .config
# leave as configured, just look, don't make any changes
ct-ng menuconfig
# then install linux kernel for the header includes
wget http://files.astlinux.org/linux-2.6.35.14.tar.gz
# finally, start the toolchain build process
ct-ng build
-# takes 40-60 min.
+# takes 50-70 min.
#########################################################################
Added: branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config (rev 0)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config 2014-01-22 22:17:54 UTC (rev 6372)
@@ -0,0 +1,475 @@
+#
+# Automatically generated make config: don't edit
+# crosstool-NG 1.19.0 Configuration
+# Wed Jan 22 05:59:57 2014
+#
+CT_CONFIGURE_has_xz=y
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_MODULES=y
+
+#
+# Paths and misc options
+#
+
+#
+# crosstool-NG behavior
+#
+# CT_OBSOLETE is not set
+# CT_EXPERIMENTAL is not set
+# CT_DEBUG_CT is not set
+
+#
+# Paths
+#
+CT_LOCAL_TARBALLS_DIR=""
+CT_WORK_DIR="${CT_TOP_DIR}/.build"
+CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.19.0/${CT_TARGET}"
+CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_RM_RF_PREFIX_DIR=y
+CT_REMOVE_DOCS=y
+CT_INSTALL_DIR_RO=y
+CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES=y
+
+#
+# Downloading
+#
+# CT_FORBID_DOWNLOAD is not set
+# CT_FORCE_DOWNLOAD is not set
+CT_CONNECT_TIMEOUT=10
+# CT_ONLY_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
+
+#
+# Extracting
+#
+# CT_FORCE_EXTRACT is not set
+CT_OVERIDE_CONFIG_GUESS_SUB=y
+# CT_ONLY_EXTRACT is not set
+CT_PATCH_BUNDLED=y
+# CT_PATCH_LOCAL is not set
+# CT_PATCH_BUNDLED_LOCAL is not set
+# CT_PATCH_LOCAL_BUNDLED is not set
+# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
+# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
+CT_PATCH_ORDER="bundled"
+
+#
+# Build behavior
+#
+CT_PARALLEL_JOBS=1
+CT_LOAD=""
+CT_USE_PIPES=y
+CT_EXTRA_CFLAGS_FOR_BUILD=""
+CT_EXTRA_LDFLAGS_FOR_BUILD=""
+CT_EXTRA_CFLAGS_FOR_HOST=""
+CT_EXTRA_LDFLAGS_FOR_HOST=""
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
+
+#
+# Logging
+#
+# CT_LOG_ERROR is not set
+# CT_LOG_WARN is not set
+CT_LOG_INFO=y
+# CT_LOG_EXTRA is not set
+# CT_LOG_ALL is not set
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="INFO"
+# CT_LOG_SEE_TOOLS_WARN is not set
+CT_LOG_PROGRESS_BAR=y
+CT_LOG_TO_FILE=y
+CT_LOG_FILE_COMPRESS=y
+
+#
+# Target options
+#
+CT_ARCH="x86"
+CT_ARCH_SUPPORTS_32=y
+CT_ARCH_SUPPORTS_64=y
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_DEFAULT_32=y
+CT_ARCH_ARCH="i586"
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_32=y
+# CT_ARCH_64 is not set
+CT_ARCH_BITNESS=32
+CT_TARGET_CFLAGS=""
+CT_TARGET_LDFLAGS=""
+# CT_ARCH_alpha is not set
+# CT_ARCH_arm is not set
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_m68k is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
+CT_ARCH_x86=y
+CT_ARCH_alpha_AVAILABLE=y
+CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_microblaze_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_SUFFIX=""
+
+#
+# Generic target options
+#
+# CT_MULTILIB is not set
+CT_ARCH_USE_MMU=y
+
+#
+# Target optimisations
+#
+CT_ARCH_FLOAT=""
+
+#
+# Toolchain options
+#
+
+#
+# General toolchain options
+#
+CT_FORCE_SYSROOT=y
+CT_USE_SYSROOT=y
+CT_SYSROOT_NAME="sysroot"
+CT_SYSROOT_DIR_PREFIX=""
+CT_WANTS_STATIC_LINK=y
+# CT_STATIC_TOOLCHAIN is not set
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
+
+#
+# Tuple completion and aliasing
+#
+CT_TARGET_VENDOR="unknown"
+CT_TARGET_ALIAS_SED_EXPR=""
+CT_TARGET_ALIAS=""
+
+#
+# Toolchain type
+#
+CT_CROSS=y
+# CT_CANADIAN is not set
+CT_TOOLCHAIN_TYPE="cross"
+
+#
+# Build system
+#
+CT_BUILD=""
+CT_BUILD_PREFIX=""
+CT_BUILD_SUFFIX=""
+
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+
+#
+# Operating System
+#
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+CT_KERNEL="linux"
+CT_KERNEL_VERSION="custom"
+# CT_KERNEL_bare_metal is not set
+CT_KERNEL_linux=y
+# CT_KERNEL_windows is not set
+CT_KERNEL_bare_metal_AVAILABLE=y
+CT_KERNEL_linux_AVAILABLE=y
+# CT_KERNEL_V_3_10 is not set
+# CT_KERNEL_V_3_9 is not set
+# CT_KERNEL_V_3_8 is not set
+# CT_KERNEL_V_3_7 is not set
+# CT_KERNEL_V_3_6 is not set
+# CT_KERNEL_V_3_5 is not set
+# CT_KERNEL_V_3_4 is not set
+# CT_KERNEL_V_3_3 is not set
+# CT_KERNEL_V_3_2 is not set
+# CT_KERNEL_V_3_1 is not set
+# CT_KERNEL_V_3_0 is not set
+# CT_KERNEL_V_2_6_39 is not set
+# CT_KERNEL_V_2_6_38 is not set
+# CT_KERNEL_V_2_6_37 is not set
+# CT_KERNEL_V_2_6_36 is not set
+# CT_KERNEL_V_2_6_33 is not set
+# CT_KERNEL_V_2_6_32 is not set
+# CT_KERNEL_V_2_6_31 is not set
+# CT_KERNEL_V_2_6_27 is not set
+CT_KERNEL_LINUX_CUSTOM=y
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-2.6.35.14.tar.gz"
+CT_KERNEL_windows_AVAILABLE=y
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# linux other options
+#
+CT_KERNEL_LINUX_VERBOSITY_0=y
+# CT_KERNEL_LINUX_VERBOSITY_1 is not set
+# CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+CT_KERNEL_LINUX_INSTALL_CHECK=y
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+CT_BINUTILS="binutils"
+CT_BINUTILS_binutils=y
+
+#
+# GNU binutils
+#
+# CT_BINUTILS_V_2_22 is not set
+# CT_BINUTILS_V_2_21_53 is not set
+# CT_BINUTILS_V_2_21_1a is not set
+CT_BINUTILS_V_2_20_1a=y
+# CT_BINUTILS_V_2_19_1a is not set
+# CT_BINUTILS_V_2_18a is not set
+CT_BINUTILS_VERSION="2.20.1a"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
+CT_BINUTILS_HAS_HASH_STYLE=y
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
+CT_BINUTILS_FORCE_LD_BFD=y
+CT_BINUTILS_LINKER_LD=y
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+# CT_BINUTILS_FOR_TARGET is not set
+
+#
+# binutils other options
+#
+
+#
+# C compiler
+#
+CT_CC="gcc"
+CT_CC_VERSION="4.4.7"
+CT_CC_CORE_PASSES_NEEDED=y
+CT_CC_gcc=y
+# CT_CC_GCC_SHOW_LINARO is not set
+# CT_CC_V_4_8_1 is not set
+# CT_CC_V_4_8_0 is not set
+# CT_CC_V_4_7_3 is not set
+# CT_CC_V_4_7_2 is not set
+# CT_CC_V_4_7_1 is not set
+# CT_CC_V_4_7_0 is not set
+# CT_CC_V_4_6_4 is not set
+# CT_CC_V_4_6_3 is not set
+# CT_CC_V_4_6_2 is not set
+# CT_CC_V_4_6_1 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_4_5_3 is not set
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+CT_CC_V_4_4_7=y
+# CT_CC_V_4_4_6 is not set
+# CT_CC_V_4_4_5 is not set
+# CT_CC_V_4_4_4 is not set
+# CT_CC_V_4_4_3 is not set
+# CT_CC_V_4_4_2 is not set
+# CT_CC_V_4_4_1 is not set
+# CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
+# CT_CC_V_4_3_5 is not set
+# CT_CC_V_4_3_4 is not set
+# CT_CC_V_4_3_3 is not set
+# CT_CC_V_4_3_2 is not set
+# CT_CC_V_4_3_1 is not set
+# CT_CC_V_4_2_4 is not set
+# CT_CC_V_4_2_2 is not set
+CT_CC_GCC_4_2_or_later=y
+CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4=y
+CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_USE_GRAPHITE=y
+# CT_CC_GCC_USE_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_USE_GMP_MPFR=y
+# CT_CC_LANG_FORTRAN is not set
+CT_CC_SUPPORT_CXX=y
+CT_CC_SUPPORT_FORTRAN=y
+CT_CC_SUPPORT_JAVA=y
+CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_OBJC=y
+CT_CC_SUPPORT_OBJCXX=y
+
+#
+# Additional supported languages:
+#
+CT_CC_LANG_CXX=y
+# CT_CC_LANG_JAVA is not set
+
+#
+# gcc other options
+#
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_STATIC_LIBSTDCXX=y
+# CT_CC_GCC_SYSTEM_ZLIB is not set
+
+#
+# Optimisation features
+#
+
+#
+# Settings for libraries running on target
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
+# CT_CC_GCC_LIBMUDFLAP is not set
+# CT_CC_GCC_LIBGOMP is not set
+# CT_CC_GCC_LIBSSP is not set
+
+#
+# Misc. obscure options.
+#
+# CT_CC_CXA_ATEXIT is not set
+CT_CC_GCC_DISABLE_PCH=y
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
+CT_CC_GCC_LDBL_128=m
+
+#
+# C-library
+#
+CT_LIBC="eglibc"
+CT_LIBC_VERSION="2_15"
+CT_LIBC_eglibc=y
+# CT_LIBC_glibc is not set
+# CT_LIBC_uClibc is not set
+CT_LIBC_eglibc_AVAILABLE=y
+# CT_LIBC_EGLIBC_V_2_17 is not set
+# CT_LIBC_EGLIBC_V_2_16 is not set
+CT_LIBC_EGLIBC_V_2_15=y
+# CT_LIBC_EGLIBC_V_2_14 is not set
+# CT_LIBC_EGLIBC_V_2_13 is not set
+# CT_LIBC_EGLIBC_V_2_12 is not set
+# CT_LIBC_EGLIBC_V_2_11 is not set
+# CT_LIBC_EGLIBC_V_2_10 is not set
+# CT_LIBC_EGLIBC_V_2_9 is not set
+# CT_LIBC_EGLIBC_V_TRUNK is not set
+CT_EGLIBC_REVISION="HEAD"
+# CT_EGLIBC_HTTP is not set
+# CT_EGLIBC_CHECKOUT is not set
+CT_EGLIBC_OPT_SIZE=y
+# CT_EGLIBC_CUSTOM_CONFIG is not set
+CT_LIBC_glibc_AVAILABLE=y
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
+CT_LIBC_uClibc_AVAILABLE=y
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
+
+#
+# Common C library options
+#
+CT_THREADS_NPTL=y
+# CT_THREADS_LINUXTHREADS is not set
+CT_LIBC_XLDD=y
+
+#
+# eglibc other options
+#
+CT_LIBC_glibc_familly=y
+CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
+CT_LIBC_GLIBC_CONFIGPARMS=""
+CT_LIBC_GLIBC_EXTRA_CFLAGS=""
+CT_LIBC_EXTRA_CC_ARGS=""
+# CT_LIBC_DISABLE_VERSIONING is not set
+CT_LIBC_OLDEST_ABI=""
+# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+# CT_LIBC_GLIBC_USE_PORTS is not set
+CT_LIBC_ADDONS_LIST=""
+# CT_LIBC_LOCALES is not set
+# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
+# CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
+CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
+CT_LIBC_GLIBC_MIN_KERNEL_VERSION="2.6.27"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.27"
+
+#
+# Debug facilities
+#
+# CT_DEBUG_dmalloc is not set
+# CT_DEBUG_duma is not set
+# CT_DEBUG_gdb is not set
+# CT_DEBUG_ltrace is not set
+# CT_DEBUG_strace is not set
+
+#
+# Companion libraries
+#
+CT_COMPLIBS_NEEDED=y
+CT_GMP_NEEDED=y
+CT_MPFR_NEEDED=y
+CT_PPL_NEEDED=y
+CT_CLOOG_NEEDED=y
+CT_COMPLIBS=y
+CT_GMP=y
+CT_MPFR=y
+CT_PPL=y
+CT_CLOOG=y
+# CT_GMP_V_5_1_1 is not set
+# CT_GMP_V_5_0_2 is not set
+# CT_GMP_V_5_0_1 is not set
+CT_GMP_V_4_3_2=y
+# CT_GMP_V_4_3_1 is not set
+# CT_GMP_V_4_3_0 is not set
+CT_GMP_VERSION="4.3.2"
+# CT_MPFR_V_3_1_2 is not set
+# CT_MPFR_V_3_1_0 is not set
+# CT_MPFR_V_3_0_1 is not set
+# CT_MPFR_V_3_0_0 is not set
+CT_MPFR_V_2_4_2=y
+# CT_MPFR_V_2_4_1 is not set
+# CT_MPFR_V_2_4_0 is not set
+CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
+# CT_PPL_V_0_11 is not set
+CT_PPL_V_0_10_2=y
+CT_PPL_VERSION="0.10.2"
+CT_PPL_NEEDS_FPERMISSIVE=y
+CT_CLOOG_V_0_15_11=y
+# CT_CLOOG_V_0_15_10 is not set
+# CT_CLOOG_V_0_15_9 is not set
+# CT_CLOOG_V_0_15_8 is not set
+# CT_CLOOG_V_0_15_7 is not set
+# CT_CLOOG_V_0_15_6 is not set
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
+
+#
+# Companion libraries common options
+#
+# CT_COMPLIBS_CHECK is not set
Deleted: branches/1.0/crosstool-ng-src/ct-ng.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng.config 2014-01-19 20:07:18 UTC (rev 6371)
+++ branches/1.0/crosstool-ng-src/ct-ng.config 2014-01-22 22:17:54 UTC (rev 6372)
@@ -1,413 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# The crosstool-NG configuration menu
-# Sun Oct 23 22:46:00 2011
-#
-CT_CONFIGURE_has_cvs=y
-CT_CONFIGURE_has_svn=y
-CT_CONFIGURE_static_link_ok=y
-CT_CONFIGURE_has_static_libstdcxx=y
-CT_MODULES=y
-
-#
-# Paths and misc options
-#
-
-#
-# crosstool-NG behavior
-#
-# CT_OBSOLETE is not set
-# CT_EXPERIMENTAL is not set
-# CT_DEBUG_CT is not set
-
-#
-# Paths
-#
-CT_LOCAL_TARBALLS_DIR=""
-CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/astlinux/x-tools/${CT_TARGET}"
-CT_INSTALL_DIR="${CT_PREFIX_DIR}"
-CT_RM_RF_PREFIX_DIR=y
-CT_REMOVE_DOCS=y
-CT_INSTALL_DIR_RO=y
-CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES=y
-
-#
-# Downloading
-#
-# CT_FORBID_DOWNLOAD is not set
-# CT_FORCE_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
-CT_CONNECT_TIMEOUT=10
-# CT_ONLY_DOWNLOAD is not set
-
-#
-# Extracting
-#
-# CT_FORCE_EXTRACT is not set
-CT_OVERIDE_CONFIG_GUESS_SUB=y
-# CT_ONLY_EXTRACT is not set
-CT_PATCH_BUNDLED=y
-# CT_PATCH_LOCAL is not set
-# CT_PATCH_BUNDLED_LOCAL is not set
-# CT_PATCH_LOCAL_BUNDLED is not set
-# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
-# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
-# CT_PATCH_NONE is not set
-CT_PATCH_ORDER="bundled"
-
-#
-# Build behavior
-#
-CT_PARALLEL_JOBS=1
-CT_LOAD=0
-CT_USE_PIPES=y
-# CT_CONFIG_SHELL_SH is not set
-# CT_CONFIG_SHELL_ASH is not set
-CT_CONFIG_SHELL_BASH=y
-# CT_CONFIG_SHELL_CUSTOM is not set
-CT_CONFIG_SHELL="bash"
-
-#
-# Logging
-#
-# CT_LOG_ERROR is not set
-# CT_LOG_WARN is not set
-CT_LOG_INFO=y
-# CT_LOG_EXTRA is not set
-# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="INFO"
-# CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=y
-CT_LOG_TO_FILE=y
-CT_LOG_FILE_COMPRESS=y
-
-#
-# Target options
-#
-CT_ARCH="x86"
-CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_64=y
-CT_ARCH_SUPPORT_ARCH=y
-CT_ARCH_SUPPORT_CPU=y
-CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_DEFAULT_32=y
-CT_ARCH_ARCH="i586"
-CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
-CT_ARCH_FLOAT_HW=y
-# CT_ARCH_FLOAT_SW is not set
-CT_TARGET_CFLAGS=""
-CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-# CT_ARCH_arm is not set
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-CT_ARCH_x86=y
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
-CT_ARCH_x86_AVAILABLE=y
-
-#
-# Generic target options
-#
-CT_ARCH_USE_MMU=y
-
-#
-# Target optimisations
-#
-
-#
-# Toolchain options
-#
-
-#
-# General toolchain options
-#
-CT_FORCE_SYSROOT=y
-CT_USE_SYSROOT=y
-CT_SYSROOT_NAME="sysroot"
-CT_SYSROOT_DIR_PREFIX=""
-CT_STATIC_TOOLCHAIN_POSSIBLE=y
-CT_TOOLCHAIN_PKGVERSION=""
-CT_TOOLCHAIN_BUGURL=""
-
-#
-# Tuple completion and aliasing
-#
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
-
-#
-# Toolchain type
-#
-CT_CROSS=y
-CT_TOOLCHAIN_TYPE="cross"
-
-#
-# Build system
-#
-CT_BUILD=""
-CT_BUILD_PREFIX=""
-CT_BUILD_SUFFIX=""
-
-#
-# Operating System
-#
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
-CT_KERNEL="linux"
-# CT_KERNEL_bare_metal is not set
-CT_KERNEL_linux=y
-CT_KERNEL_bare_metal_AVAILABLE=y
-CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-# CT_KERNEL_V_3_0 is not set
-# CT_KERNEL_V_2_6_39_3 is not set
-# CT_KERNEL_V_2_6_39_2 is not set
-# CT_KERNEL_V_2_6_39_1 is not set
-# CT_KERNEL_V_2_6_39 is not set
-# CT_KERNEL_V_2_6_38_8 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
-# CT_KERNEL_V_2_6_34_10 is not set
-# CT_KERNEL_V_2_6_33_16 is not set
-# CT_KERNEL_V_2_6_32_43 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_59 is not set
-CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_TARBALL="${CT_TOP_DIR}/linux-2.6.35.14.tar.gz"
-CT_KERNEL_mingw32_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
-
-#
-# linux other options
-#
-CT_KERNEL_LINUX_VERBOSITY_0=y
-# CT_KERNEL_LINUX_VERBOSITY_1 is not set
-# CT_KERNEL_LINUX_VERBOSITY_2 is not set
-CT_KERNEL_LINUX_VERBOSE_LEVEL=0
-CT_KERNEL_LINUX_INSTALL_CHECK=y
-
-#
-# Binary utilities
-#
-CT_ARCH_BINFMT_ELF=y
-
-#
-# GNU binutils
-#
-CT_BINUTILS_V_2_20_1a=y
-# CT_BINUTILS_V_2_19_1a is not set
-# CT_BINUTILS_V_2_18a is not set
-CT_BINUTILS_VERSION="2.20.1a"
-CT_BINUTILS_2_20_or_later=y
-CT_BINUTILS_2_19_or_later=y
-CT_BINUTILS_2_18_or_later=y
-CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
-CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
-CT_BINUTILS_FORCE_LD_BFD=y
-CT_BINUTILS_LINKER_LD=y
-CT_BINUTILS_LINKERS_LIST="ld"
-CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
-# CT_BINUTILS_FOR_TARGET is not set
-
-#
-# C compiler
-#
-CT_CC="gcc"
-CT_CC_VERSION="4.4.5"
-CT_CC_gcc=y
-# CT_CC_V_4_4_6 is not set
-CT_CC_V_4_4_5=y
-# CT_CC_V_4_4_4 is not set
-# CT_CC_V_4_4_3 is not set
-# CT_CC_V_4_4_2 is not set
-# CT_CC_V_4_4_1 is not set
-# CT_CC_V_4_4_0 is not set
-# CT_CC_V_4_3_6 is not set
-# CT_CC_V_4_3_5 is not set
-# CT_CC_V_4_3_4 is not set
-# CT_CC_V_4_3_3 is not set
-# CT_CC_V_4_3_2 is not set
-# CT_CC_V_4_3_1 is not set
-# CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_2 is not set
-CT_CC_GCC_4_2_or_later=y
-CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
-CT_CC_GCC_4_4_or_later=y
-CT_CC_GCC_HAS_GRAPHITE=y
-CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
-CT_CC_GCC_USE_GMP_MPFR=y
-CT_CC_GCC_USE_PPL_CLOOG=y
-# CT_CC_LANG_FORTRAN is not set
-CT_CC_SUPPORT_CXX=y
-CT_CC_SUPPORT_FORTRAN=y
-CT_CC_SUPPORT_JAVA=y
-CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_OBJC=y
-CT_CC_SUPPORT_OBJCXX=y
-
-#
-# Additional supported languages:
-#
-CT_CC_LANG_CXX=y
-# CT_CC_LANG_JAVA is not set
-
-#
-# gcc other options
-#
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
-CT_CC_STATIC_LIBSTDCXX=y
-
-#
-# Optimisation features
-#
-CT_CC_GCC_USE_GRAPHITE=y
-
-#
-# Settings for libraries running on target
-#
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-# CT_CC_GCC_LIBMUDFLAP is not set
-# CT_CC_GCC_LIBGOMP is not set
-# CT_CC_GCC_LIBSSP is not set
-
-#
-# Misc. obscure options.
-#
-# CT_CC_CXA_ATEXIT is not set
-CT_CC_GCC_DISABLE_PCH=y
-CT_CC_GCC_SJLJ_EXCEPTIONS=m
-CT_CC_GCC_LDBL_128=m
-
-#
-# C-library
-#
-CT_LIBC="eglibc"
-CT_LIBC_VERSION="2_12"
-CT_LIBC_eglibc=y
-# CT_LIBC_glibc is not set
-# CT_LIBC_uClibc is not set
-CT_LIBC_eglibc_AVAILABLE=y
-CT_LIBC_EGLIBC_V_2_12=y
-# CT_LIBC_EGLIBC_V_2_11 is not set
-# CT_LIBC_EGLIBC_V_2_10 is not set
-# CT_LIBC_EGLIBC_V_2_9 is not set
-# CT_LIBC_EGLIBC_V_TRUNK is not set
-CT_LIBC_EGLIBC_2_12_or_later=y
-CT_LIBC_EGLIBC_2_11_or_later=y
-CT_LIBC_EGLIBC_2_10_or_later=y
-CT_LIBC_EGLIBC_2_9_or_later=y
-CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL=y
-CT_EGLIBC_REVISION="HEAD"
-# CT_EGLIBC_HTTP is not set
-# CT_EGLIBC_CHECKOUT is not set
-# CT_EGLIBC_OPT_SIZE is not set
-# CT_EGLIBC_CUSTOM_CONFIG is not set
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-CT_LIBC_XLDD=y
-
-#
-# eglibc other options
-#
-CT_LIBC_glibc_familly=y
-CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
-CT_LIBC_GLIBC_CONFIGPARMS=""
-CT_LIBC_GLIBC_EXTRA_CFLAGS=""
-CT_LIBC_EXTRA_CC_ARGS=""
-# CT_LIBC_DISABLE_VERSIONING is not set
-CT_LIBC_OLDEST_ABI=""
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
-# CT_LIBC_GLIBC_USE_PORTS is not set
-CT_LIBC_ADDONS_LIST=""
-# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_LIBC_GLIBC_MIN_KERNEL_VERSION="2.6.27"
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.27"
-
-#
-# Debug facilities
-#
-# CT_DEBUG_dmalloc is not set
-# CT_DEBUG_duma is not set
-# CT_DEBUG_gdb is not set
-# CT_DEBUG_ltrace is not set
-# CT_DEBUG_strace is not set
-
-#
-# Companion libraries
-#
-CT_COMPLIBS_NEEDED=y
-CT_GMP_NEEDED=y
-CT_MPFR_NEEDED=y
-CT_PPL_NEEDED=y
-CT_CLOOG_NEEDED=y
-CT_COMPLIBS=y
-CT_GMP=y
-CT_MPFR=y
-CT_PPL=y
-CT_CLOOG=y
-CT_GMP_V_4_3_2=y
-# CT_GMP_V_4_3_1 is not set
-# CT_GMP_V_4_3_0 is not set
-CT_GMP_VERSION="4.3.2"
-CT_MPFR_V_3_0_0=y
-# CT_MPFR_V_2_4_2 is not set
-# CT_MPFR_V_2_4_1 is not set
-# CT_MPFR_V_2_4_0 is not set
-CT_MPFR_VERSION="3.0.0"
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-CT_CLOOG_V_0_15_10=y
-# CT_CLOOG_V_0_15_9 is not set
-# CT_CLOOG_V_0_15_8 is not set
-# CT_CLOOG_V_0_15_7 is not set
-# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.10"
-
-#
-# Companion libraries common options
-#
-# CT_COMPLIBS_CHECK is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-01-19 20:07:18 UTC (rev 6371)
+++ branches/1.0/initrd.config 2014-01-22 22:17:54 UTC (rev 6372)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6322-dirty Configuration
-# Wed Dec 25 14:09:57 2013
+# Buildroot 2011.08-svn6371-dirty Configuration
+# Mon Jan 20 14:49:55 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -71,7 +71,7 @@
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
BR2_SOURCEFORGE_MIRROR="voxel"
-BR2_KERNEL_MIRROR="http://mirror.nexcess.net/kernel.org"
+BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
BR2_JLEVEL=1
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
@@ -146,9 +146,10 @@
BR2_PACKAGE_BUSYBOX=y
# BR2_BUSYBOX_VERSION_1_16_X is not set
# BR2_BUSYBOX_VERSION_1_17_X is not set
-BR2_BUSYBOX_VERSION_1_18_X=y
+# BR2_BUSYBOX_VERSION_1_18_X is not set
+BR2_BUSYBOX_VERSION_1_19_X=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.18.5"
+BR2_BUSYBOX_VERSION="1.19.4"
BR2_PACKAGE_BUSYBOX_CONFIG="project/initrd/busybox.config"
# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
# BR2_PACKAGE_CUSTOMIZE is not set
Modified: branches/1.0/package/busybox/Config.in
===================================================================
--- branches/1.0/package/busybox/Config.in 2014-01-19 20:07:18 UTC (rev 6371)
+++ branches/1.0/package/busybox/Config.in 2014-01-22 22:17:54 UTC (rev 6372)
@@ -30,6 +30,9 @@
config BR2_BUSYBOX_VERSION_1_18_X
bool "BusyBox 1.18.x"
+ config BR2_BUSYBOX_VERSION_1_19_X
+ bool "BusyBox 1.19.x"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -41,6 +44,7 @@
default "1.16.2" if BR2_BUSYBOX_VERSION_1_16_X
default "1.17.4" if BR2_BUSYBOX_VERSION_1_17_X
default "1.18.5" if BR2_BUSYBOX_VERSION_1_18_X
+ default "1.19.4" if BR2_BUSYBOX_VERSION_1_19_X
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
@@ -49,6 +53,7 @@
default "package/busybox/busybox-1.16.x.config" if BR2_BUSYBOX_VERSION_1_16_X
default "package/busybox/busybox-1.17.x.config" if BR2_BUSYBOX_VERSION_1_17_X
default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
+ default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Modified: branches/1.0/package/busybox/busybox-utmp-no-touch.patch
===================================================================
--- branches/1.0/package/busybox/busybox-utmp-no-touch.patch 2014-01-19 20:07:18 UTC (rev 6371)
+++ branches/1.0/package/busybox/busybox-utmp-no-touch.patch 2014-01-22 22:17:54 UTC (rev 6372)
@@ -1,8 +1,8 @@
---- busybox-1.18.5/libbb/utmp.c.orig 2012-01-25 13:44:40.000000000 -0600
-+++ busybox-1.18.5/libbb/utmp.c 2012-01-25 18:05:29.000000000 -0600
-@@ -9,12 +9,6 @@
+--- busybox-1.19.4/libbb/utmp.c.orig 2012-02-04 13:24:55.000000000 -0600
++++ busybox-1.19.4/libbb/utmp.c 2014-01-20 17:25:27.000000000 -0600
+@@ -8,12 +8,6 @@
+ */
#include "libbb.h"
- #include <utmp.h>
-static void touch(const char *filename)
-{
@@ -13,7 +13,7 @@...
[truncated message content] |
|
From: <abe...@us...> - 2014-01-23 00:35:34
|
Revision: 6373
http://sourceforge.net/p/astlinux/code/6373
Author: abelbeck
Date: 2014-01-23 00:35:32 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
php, enable SimpleXML support for default builds
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-01-22 22:17:54 UTC (rev 6372)
+++ branches/1.0/astlinux-ast11.config 2014-01-23 00:35:32 UTC (rev 6373)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6371-dirty Configuration
-# Mon Jan 20 14:49:32 2014
+# Buildroot 2011.08-svn6372-dirty Configuration
+# Wed Jan 22 18:33:28 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -457,7 +457,7 @@
# BR2_PACKAGE_PHP_EXT_CURL is not set
BR2_PACKAGE_PHP_EXT_LIBXML2=y
BR2_PACKAGE_PHP_EXT_XMLPARSER=y
-# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
+BR2_PACKAGE_PHP_EXT_SIMPLEXML=y
BR2_PACKAGE_PHP_EXT_ZLIB=y
# BR2_PACKAGE_PHP_EXT_EXIF is not set
# BR2_PACKAGE_PHP_EXT_FTP is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-01-22 22:17:54 UTC (rev 6372)
+++ branches/1.0/astlinux18.config 2014-01-23 00:35:32 UTC (rev 6373)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6371-dirty Configuration
-# Mon Jan 20 14:49:27 2014
+# Buildroot 2011.08-svn6372-dirty Configuration
+# Wed Jan 22 18:33:27 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -457,7 +457,7 @@
# BR2_PACKAGE_PHP_EXT_CURL is not set
BR2_PACKAGE_PHP_EXT_LIBXML2=y
BR2_PACKAGE_PHP_EXT_XMLPARSER=y
-# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
+BR2_PACKAGE_PHP_EXT_SIMPLEXML=y
BR2_PACKAGE_PHP_EXT_ZLIB=y
# BR2_PACKAGE_PHP_EXT_EXIF is not set
# BR2_PACKAGE_PHP_EXT_FTP is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X