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

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

Revision: 418
          http://svn.sourceforge.net/astlinux/?rev=418&view=rev
Author:   krisk84
Date:     2006-10-18 14:41:17 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
back out Ingmar's changes - for now

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

Removed Paths:
-------------
    trunk/package/efax/
    trunk/package/iaxmodem/
    trunk/package/libtiff/
    trunk/target/generic/target_skeleton/etc/runlevels/default/K04iaxmodem
    trunk/target/generic/target_skeleton/etc/runlevels/default/S61iaxmodem

Modified: trunk/package/Config.in
===================================================================

--- trunk/package/Config.in	2006-10-18 21:32:55 UTC (rev 417)
+++ trunk/package/Config.in	2006-10-18 21:41:17 UTC (rev 418)
@@ -35,7 +35,6 @@
 source "package/chan_misdn/Config.in"
 source "package/apcupsd/Config.in"
 source "package/astmanproxy/Config.in"
-source "package/iaxmodem/Config.in"
 source "package/at/Config.in"
 source "package/autoconf/Config.in"
 source "package/automake/Config.in"
@@ -55,7 +54,6 @@
 source "package/dm/Config.in"
 source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
-source "package/efax/Config.in"
 source "package/expat/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fakeroot/Config.in"
@@ -63,7 +61,6 @@
 source "package/flite/Config.in"
 source "package/freetype/Config.in"
 source "package/gettext/Config.in"
-source "package/ghostscript/Config.in"
 source "package/gzip/Config.in"
 source "package/hostap/Config.in"
 source "package/hotplug/Config.in"
@@ -87,7 +84,6 @@
 source "package/libpq/Config.in"
 source "package/libpri/Config.in"
 source "package/libsysfs/Config.in"
-source "package/libtiff/Config.in"
 source "package/libtool/Config.in"
 source "package/libusb/Config.in"
 source "package/lighttpd/Config.in"

Modified: trunk/package/usbutils/usbutils.mk
===================================================================
--- trunk/package/usbutils/usbutils.mk	2006-10-18 21:32:55 UTC (rev 417)
+++ trunk/package/usbutils/usbutils.mk	2006-10-18 21:41:17 UTC (rev 418)
@@ -33,16 +33,14 @@
 	);
 	touch $(USBUTILS_DIR)/.configured
 
-$(USBUTILS_DIR)/.built: $(USBUTILS_DIR)/.configured
+$(USBUTILS_DIR)/$(USBUTILS_BINARY): $(USBUTILS_DIR)/.configured
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(USBUTILS_DIR)
-	touch $(USBUTILS_DIR)/.built
 
-$(USBUTILS_DIR)/.installed: $(USBUTILS_DIR)/.built
+$(TARGET_DIR)/$(USBUTILS_TARGET_BINARY): $(USBUTILS_DIR)/$(USBUTILS_BINARY)
 	make -C $(USBUTILS_DIR) DESTDIR=$(TARGET_DIR) install
 	rm -rf $(TARGET_DIR)/usr/man
-	touch $(USBUTILS_DIR)/.installed
 
-usbutils: uclibc libusb $(USBUTILS_DIR)/.installed
+usbutils: uclibc libusb $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY)
 
 usbutils-clean:
 	rm -f $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY)

Modified: trunk/target/generic/target_skeleton/etc/init.d/misc
===================================================================
--- trunk/target/generic/target_skeleton/etc/init.d/misc	2006-10-18 21:32:55 UTC (rev 417)
+++ trunk/target/generic/target_skeleton/etc/init.d/misc	2006-10-18 21:41:17 UTC (rev 418)
@@ -34,20 +34,12 @@
 port $PORT
 maildomain $DOMAIN" > /tmp/etc/msmtprc
 
-if [ "$SMTP_TLS" ]
+if [ "$SMTP_TLS" -a "$SMTP_CA" ]
 then
-echo "tls on" >> /tmp/etc/msmtprc
-
-if [ "$SMTP_CA" ]
-then
-echo "tls_trust_file $SMTP_CA" >> /tmp/etc/msmtprc
+echo "tls on
+tls_trust_file $SMTP_CA" >> /tmp/etc/msmtprc
 fi
 
-if [ "$SMTP_CERTCHECK" ]
-then
-echo "tls_certcheck $SMTP_CERTCHECK" >> /tmp/etc/msmtprc
-fi
-
 if [ "$SMTP_USER" -a "$SMTP_PASS" -a "$SMTP_AUTH" ]
 then
 echo "auth $SMTP_AUTH

Deleted: trunk/target/generic/target_skeleton/etc/runlevels/default/K04iaxmodem
===================================================================
--- trunk/target/generic/target_skeleton/etc/runlevels/default/K04iaxmodem	2006-10-18 21:32:55 UTC (rev 417)
+++ trunk/target/generic/target_skeleton/etc/runlevels/default/K04iaxmodem	2006-10-18 21:41:17 UTC (rev 418)
@@ -1 +0,0 @@
-link ../../init.d/iaxmodem
\ No newline at end of file

Deleted: trunk/target/generic/target_skeleton/etc/runlevels/default/S61iaxmodem
===================================================================
--- trunk/target/generic/target_skeleton/etc/runlevels/default/S61iaxmodem	2006-10-18 21:32:55 UTC (rev 417)
+++ trunk/target/generic/target_skeleton/etc/runlevels/default/S61iaxmodem	2006-10-18 21:41:17 UTC (rev 418)
@@ -1 +0,0 @@
-link ../../init.d/iaxmodem
\ No newline at end of file

Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf	2006-10-18 21:32:55 UTC (rev 417)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf	2006-10-18 21:41:17 UTC (rev 418)
@@ -427,11 +427,10 @@
 ##The from hostname of SMTP messages.
 #SMTP_HOSTNAME="pbx"
 
-##If SMTP_TLS is defined, we will use TLS.  You should have a trusted cert list and define its location with SMTP_CA. Optionally, you can turn off the certificate verification. This is a security risk!
+##If SMTP_TLS is defined, we will use TLS.  You also need to set SMTP_CA
 ##to the location of a trusted cert list.
 #SMTP_TLS=YES
 #SMTP_CA=/stat/etc/ca.crt # some file
-#SMTP_CERTCHECK=off
 
 ##The username and password for communicating with the SMTP server.
 #SMTP_USER=username


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


