Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [415] trunk
|
From: <kr...@us...> - 2006-10-18 21:28:18
|
Revision: 415
http://svn.sourceforge.net/astlinux/?rev=415&view=rev
Author: krisk84
Date: 2006-10-18 14:27:47 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
merge Ingmar's branch - efax,libtiff,iaxmodem,etc
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
Added Paths:
-----------
trunk/package/efax/
trunk/package/efax/Config.in
trunk/package/efax/efax.mk
trunk/package/efax/efax.patch
trunk/package/iaxmodem/
trunk/package/iaxmodem/Config.in
trunk/package/iaxmodem/iaxmodem.mk
trunk/package/libtiff/
trunk/package/libtiff/Config.in
trunk/package/libtiff/libtiff.mk
trunk/target/generic/target_skeleton/etc/init.d/iaxmodem
Removed Paths:
-------------
trunk/package/efax/Config.in
trunk/package/efax/efax.mk
trunk/package/efax/efax.patch
trunk/package/iaxmodem/Config.in
trunk/package/iaxmodem/iaxmodem.mk
trunk/package/libtiff/Config.in
trunk/package/libtiff/libtiff.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/Config.in 2006-10-18 21:27:47 UTC (rev 415)
@@ -35,6 +35,7 @@
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"
@@ -54,6 +55,7 @@
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"
@@ -61,6 +63,7 @@
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"
@@ -84,6 +87,7 @@
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"
Copied: trunk/package/efax (from rev 414, branches/ischraub/package/efax)
Deleted: trunk/package/efax/Config.in
===================================================================
--- branches/ischraub/package/efax/Config.in 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/efax/Config.in 2006-10-18 21:27:47 UTC (rev 415)
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_EFAX
- bool "efax"
- default n
- help
- efax - fax software, can be used e.g. together with iaxmodem
-
- http://www.cce.com/efax/download/efax-0.9a-001114.tar.gz
Copied: trunk/package/efax/Config.in (from rev 414, branches/ischraub/package/efax/Config.in)
===================================================================
--- trunk/package/efax/Config.in (rev 0)
+++ trunk/package/efax/Config.in 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_EFAX
+ bool "efax"
+ default n
+ help
+ efax - fax software, can be used e.g. together with iaxmodem
+
+ http://www.cce.com/efax/download/efax-0.9a-001114.tar.gz
Deleted: trunk/package/efax/efax.mk
===================================================================
--- branches/ischraub/package/efax/efax.mk 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/efax/efax.mk 2006-10-18 21:27:47 UTC (rev 415)
@@ -1,49 +0,0 @@
-#############################################################
-#
-# efax
-#
-#############################################################
-EFAX_VER:=0.9a-001114
-EFAX_SOURCE:=efax-$(EFAX_VER).tar.gz
-EFAX_SITE:=http://www.cce.com/efax/download
-EFAX_DIR:=$(BUILD_DIR)/efax-$(EFAX_VER)
-EFAX_CAT:=zcat
-EFAX_BINARY:=$(EFAX_DIR)/efax
-EFAX_TARGET_BINARY:=$(TARGET_DIR)/usr/sbin/efax
-
-$(DL_DIR)/$(EFAX_SOURCE):
- $(WGET) -P $(DL_DIR) $(EFAX_SITE)/$(EFAX_SOURCE)
-
-$(EFAX_DIR)/.unpacked: $(DL_DIR)/$(EFAX_SOURCE)
- $(EFAX_CAT) $(DL_DIR)/$(EFAX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(EFAX_DIR)/.unpacked
-
-$(EFAX_DIR)/.built: $(EFAX_DIR)/.unpacked
- toolchain/patch-kernel.sh $(EFAX_DIR) package/efax/ efax\*.patch
- $(MAKE) CC=$(TARGET_CC) CFLAGS="-I$(STAGING_DIR)/usr/include" LDFLAGS="-L$(TARGET_DIR)/lib" -C $(EFAX_DIR)
- touch $(EFAX_DIR)/.built
-
-$(EFAX_DIR)/.installed: $(EFAX_DIR)/.built
- install -D -m 0755 $(EFAX_BINARY) $(EFAX_TARGET_BINARY)
- $(STRIP) --strip-unneeded $(EFAX_TARGET_BINARY)
- install -D -m 0755 $(EFAX_DIR)/efix $(TARGET_DIR)/usr/bin/efix
- $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/efix
- install -D -m 0755 $(EFAX_DIR)/fax $(TARGET_DIR)/usr/bin/fax
- touch $(EFAX_DIR)/.built
-
-efax: uclibc $(EFAX_DIR)/.installed
-
-efax-clean:
- $(MAKE) -C $(EFAX_DIR) clean
-
-efax-dirclean:
- rm -rf $(EFAX_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_EFAX)),y)
-TARGETS+=efax
-endif
Copied: trunk/package/efax/efax.mk (from rev 414, branches/ischraub/package/efax/efax.mk)
===================================================================
--- trunk/package/efax/efax.mk (rev 0)
+++ trunk/package/efax/efax.mk 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,49 @@
+#############################################################
+#
+# efax
+#
+#############################################################
+EFAX_VER:=0.9a-001114
+EFAX_SOURCE:=efax-$(EFAX_VER).tar.gz
+EFAX_SITE:=http://www.cce.com/efax/download
+EFAX_DIR:=$(BUILD_DIR)/efax-$(EFAX_VER)
+EFAX_CAT:=zcat
+EFAX_BINARY:=$(EFAX_DIR)/efax
+EFAX_TARGET_BINARY:=$(TARGET_DIR)/usr/sbin/efax
+
+$(DL_DIR)/$(EFAX_SOURCE):
+ $(WGET) -P $(DL_DIR) $(EFAX_SITE)/$(EFAX_SOURCE)
+
+$(EFAX_DIR)/.unpacked: $(DL_DIR)/$(EFAX_SOURCE)
+ $(EFAX_CAT) $(DL_DIR)/$(EFAX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(EFAX_DIR)/.unpacked
+
+$(EFAX_DIR)/.built: $(EFAX_DIR)/.unpacked
+ toolchain/patch-kernel.sh $(EFAX_DIR) package/efax/ efax\*.patch
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="-I$(STAGING_DIR)/usr/include" LDFLAGS="-L$(TARGET_DIR)/lib" -C $(EFAX_DIR)
+ touch $(EFAX_DIR)/.built
+
+$(EFAX_DIR)/.installed: $(EFAX_DIR)/.built
+ install -D -m 0755 $(EFAX_BINARY) $(EFAX_TARGET_BINARY)
+ $(STRIP) --strip-unneeded $(EFAX_TARGET_BINARY)
+ install -D -m 0755 $(EFAX_DIR)/efix $(TARGET_DIR)/usr/bin/efix
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/efix
+ install -D -m 0755 $(EFAX_DIR)/fax $(TARGET_DIR)/usr/bin/fax
+ touch $(EFAX_DIR)/.built
+
+efax: uclibc $(EFAX_DIR)/.installed
+
+efax-clean:
+ $(MAKE) -C $(EFAX_DIR) clean
+
+efax-dirclean:
+ rm -rf $(EFAX_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_EFAX)),y)
+TARGETS+=efax
+endif
Deleted: trunk/package/efax/efax.patch
===================================================================
--- branches/ischraub/package/efax/efax.patch 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/efax/efax.patch 2006-10-18 21:27:47 UTC (rev 415)
@@ -1,31 +0,0 @@
---- efax-0.9a-001114/Makefile.orig 2006-09-22 15:09:13.000000000 +0200
-+++ efax-0.9a-001114/Makefile 2006-09-22 15:12:31.000000000 +0200
-@@ -3,13 +3,13 @@
- # Change the following to the name of your ANSI C compiler
- # (normally gcc).
-
--CC=gcc
-+#CC=gcc
-
- # Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror
- # is undefined
-
--CFLAGS=
--LDFLAGS=
-+#CFLAGS=
-+#LDFLAGS=
-
- # Change the following to the destination directories for
- # binaries and man pages. Probably /usr/bin and /usr/man on
-@@ -25,11 +25,9 @@
-
- efax: efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
- $(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
-- strip efax
-
- efix: efix.o efaxlib.o efaxmsg.o
- $(CC) -o efix $(LDFLAGS) efix.o efaxlib.o efaxmsg.o
-- strip efix
-
- install:
- cp fax efax efix $(BINDIR)
Copied: trunk/package/efax/efax.patch (from rev 414, branches/ischraub/package/efax/efax.patch)
===================================================================
--- trunk/package/efax/efax.patch (rev 0)
+++ trunk/package/efax/efax.patch 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,31 @@
+--- efax-0.9a-001114/Makefile.orig 2006-09-22 15:09:13.000000000 +0200
++++ efax-0.9a-001114/Makefile 2006-09-22 15:12:31.000000000 +0200
+@@ -3,13 +3,13 @@
+ # Change the following to the name of your ANSI C compiler
+ # (normally gcc).
+
+-CC=gcc
++#CC=gcc
+
+ # Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror
+ # is undefined
+
+-CFLAGS=
+-LDFLAGS=
++#CFLAGS=
++#LDFLAGS=
+
+ # Change the following to the destination directories for
+ # binaries and man pages. Probably /usr/bin and /usr/man on
+@@ -25,11 +25,9 @@
+
+ efax: efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
+ $(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
+- strip efax
+
+ efix: efix.o efaxlib.o efaxmsg.o
+ $(CC) -o efix $(LDFLAGS) efix.o efaxlib.o efaxmsg.o
+- strip efix
+
+ install:
+ cp fax efax efix $(BINDIR)
Copied: trunk/package/iaxmodem (from rev 414, branches/ischraub/package/iaxmodem)
Deleted: trunk/package/iaxmodem/Config.in
===================================================================
--- branches/ischraub/package/iaxmodem/Config.in 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/iaxmodem/Config.in 2006-10-18 21:27:47 UTC (rev 415)
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_IAXMODEM
- bool "iaxmodem"
- default n
- help
- iaxmodem - IAX Modem for Asterisk (works with Hylafax, efax, sendfax)
-
- http://mesh.dl.sourceforge.net/sourceforge/iaxmodem/iaxmodem-0.1.14.tar.gz
Copied: trunk/package/iaxmodem/Config.in (from rev 414, branches/ischraub/package/iaxmodem/Config.in)
===================================================================
--- trunk/package/iaxmodem/Config.in (rev 0)
+++ trunk/package/iaxmodem/Config.in 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_IAXMODEM
+ bool "iaxmodem"
+ default n
+ help
+ iaxmodem - IAX Modem for Asterisk (works with Hylafax, efax, sendfax)
+
+ http://mesh.dl.sourceforge.net/sourceforge/iaxmodem/iaxmodem-0.1.14.tar.gz
Deleted: trunk/package/iaxmodem/iaxmodem.mk
===================================================================
--- branches/ischraub/package/iaxmodem/iaxmodem.mk 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/iaxmodem/iaxmodem.mk 2006-10-18 21:27:47 UTC (rev 415)
@@ -1,126 +0,0 @@
-#############################################################
-#
-# iaxmodem
-#
-#############################################################
-IAXMODEM_VER:=0.1.14
-IAXMODEM_SOURCE:=iaxmodem-$(IAXMODEM_VER).tar.gz
-IAXMODEM_SITE:=http://mesh.dl.sourceforge.net/sourceforge/iaxmodem
-IAXMODEM_DIR:=$(BUILD_DIR)/iaxmodem-$(IAXMODEM_VER)
-IAXMODEM_CAT:=zcat
-IAXMODEM_BINARY:=$(IAXMODEM_DIR)/iaxmodem
-IAXMODEM_TARGET_BINARY:=$(TARGET_DIR)/usr/sbin/iaxmodem
-
-$(DL_DIR)/$(IAXMODEM_SOURCE):
- $(WGET) -P $(DL_DIR) $(IAXMODEM_SITE)/$(IAXMODEM_SOURCE)
-
-$(IAXMODEM_DIR)/.unpacked: $(DL_DIR)/$(IAXMODEM_SOURCE)
- $(IAXMODEM_CAT) $(DL_DIR)/$(IAXMODEM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(IAXMODEM_DIR)/.unpacked
-
-$(IAXMODEM_DIR)/.spandsp_configured: $(IAXMODEM_DIR)/.unpacked
- (cd $(IAXMODEM_DIR)/lib/spandsp; rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
- CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(TARGET_DIR)/usr/lib" \
- ac_cv_file__usr_X11R6_lib=no \
- ac_cv_file__usr_X11R6_lib64=no \
- ac_cv_func_realloc_0_nonnull=yes \
- ac_cv_func_malloc_0_nonnull=yes \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- );
- touch $(IAXMODEM_DIR)/.spandsp_configured
-
-$(IAXMODEM_DIR)/.spandsp_built: $(IAXMODEM_DIR)/.spandsp_configured
- $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/spandsp
- touch $(IAXMODEM_DIR)/.spandsp_built
-
-$(IAXMODEM_DIR)/.spandsp_installed: $(IAXMODEM_DIR)/.spandsp_built
- make -C $(IAXMODEM_DIR)/lib/spandsp DESTDIR=$(TARGET_DIR) install
- cp -r $(TARGET_DIR)/usr/include/* $(STAGING_DIR)/usr/include
- rm -rf $(TARGET_DIR)/usr/include
- rm -f $(TARGET_DIR)/usr/lib/libspandsp*.a $(TARGET_DIR)/usr/lib/libspandsp*.la
- $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libspandsp*
- touch $(IAXMODEM_DIR)/.spandsp_installed
-
-$(IAXMODEM_DIR)/.libiax2_configured: $(IAXMODEM_DIR)/.spandsp_installed
- (cd $(IAXMODEM_DIR)/lib/libiax2; rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
- CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(TARGET_DIR)/usr/lib" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- );
- touch $(IAXMODEM_DIR)/.libiax2_configured
-
-$(IAXMODEM_DIR)/.libiax2_built: $(IAXMODEM_DIR)/.libiax2_configured
- $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/libiax2
- touch $(IAXMODEM_DIR)/.libiax2_built
-
-$(IAXMODEM_DIR)/.libiax2_installed: $(IAXMODEM_DIR)/.libiax2_built
- make -C $(IAXMODEM_DIR)/lib/libiax2 DESTDIR=$(TARGET_DIR) install
- mkdir -p $(STAGING_DIR)/usr/include/iax
- cp $(IAXMODEM_DIR)/lib/libiax2/src/iax-client.h $(STAGING_DIR)/usr/include/iax
- cp $(IAXMODEM_DIR)/lib/libiax2/src/iax2.h $(STAGING_DIR)/usr/include/iax
- cp $(IAXMODEM_DIR)/lib/libiax2/src/frame.h $(STAGING_DIR)/usr/include/iax
- cp $(IAXMODEM_DIR)/lib/libiax2/src/iax2-parser.h $(STAGING_DIR)/usr/include/iax
- rm -f $(TARGET_DIR)/usr/lib/libiax*.a $(TARGET_DIR)/usr/lib/libiax*.la
- $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libiax*
- touch $(IAXMODEM_DIR)/.libiax2_installed
-
-$(IAXMODEM_DIR)/.built: $(IAXMODEM_DIR)/.libiax2_installed
- (cd $(IAXMODEM_DIR); \
- $(TARGET_CC) -Wall -g -O2 -D_GNU_SOURCE -I$(STAGING_DIR)/usr/include -L$(TARGET_DIR)/usr/lib -lm -liax -lutil -lspandsp -ltiff -o iaxmodem iaxmodem.c \
- );
-
-$(IAXMODEM_DIR)/.installed: $(IAXMODEM_DIR)/.built
- install -D -m 0755 $(IAXMODEM_BINARY) $(IAXMODEM_TARGET_BINARY)
- $(STRIP) --strip-unneeded $(IAXMODEM_TARGET_BINARY)
- mkdir -p $(TARGET_DIR)/stat/etc/iaxmodem
- cp $(IAXMODEM_DIR)/iaxmodem-cfg.ttyIAX $(TARGET_DIR)/stat/etc/iaxmodem
- touch $(IAXMODEM_DIR)/.built
-
-iaxmodem: uclibc libtiff $(IAXMODEM_DIR)/.installed
-
-iaxmodem-clean:
- $(MAKE) -C $(IAXMODEM_DIR)/lib/spandsp clean
- $(MAKE) -C $(IAXMODEM_DIR)/lib/libiax2 clean
- rm $(IAXMODEM_DIR)/iaxmodem
- rm $(IAXMODEM_DIR)/iaxmodem.o
-
-iaxmodem-dirclean:
- rm -rf $(IAXMODEM_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_IAXMODEM)),y)
-TARGETS+=iaxmodem
-endif
Copied: trunk/package/iaxmodem/iaxmodem.mk (from rev 414, branches/ischraub/package/iaxmodem/iaxmodem.mk)
===================================================================
--- trunk/package/iaxmodem/iaxmodem.mk (rev 0)
+++ trunk/package/iaxmodem/iaxmodem.mk 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,126 @@
+#############################################################
+#
+# iaxmodem
+#
+#############################################################
+IAXMODEM_VER:=0.1.14
+IAXMODEM_SOURCE:=iaxmodem-$(IAXMODEM_VER).tar.gz
+IAXMODEM_SITE:=http://mesh.dl.sourceforge.net/sourceforge/iaxmodem
+IAXMODEM_DIR:=$(BUILD_DIR)/iaxmodem-$(IAXMODEM_VER)
+IAXMODEM_CAT:=zcat
+IAXMODEM_BINARY:=$(IAXMODEM_DIR)/iaxmodem
+IAXMODEM_TARGET_BINARY:=$(TARGET_DIR)/usr/sbin/iaxmodem
+
+$(DL_DIR)/$(IAXMODEM_SOURCE):
+ $(WGET) -P $(DL_DIR) $(IAXMODEM_SITE)/$(IAXMODEM_SOURCE)
+
+$(IAXMODEM_DIR)/.unpacked: $(DL_DIR)/$(IAXMODEM_SOURCE)
+ $(IAXMODEM_CAT) $(DL_DIR)/$(IAXMODEM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(IAXMODEM_DIR)/.unpacked
+
+$(IAXMODEM_DIR)/.spandsp_configured: $(IAXMODEM_DIR)/.unpacked
+ (cd $(IAXMODEM_DIR)/lib/spandsp; rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+ LDFLAGS="-L$(TARGET_DIR)/usr/lib" \
+ ac_cv_file__usr_X11R6_lib=no \
+ ac_cv_file__usr_X11R6_lib64=no \
+ ac_cv_func_realloc_0_nonnull=yes \
+ ac_cv_func_malloc_0_nonnull=yes \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --datadir=/usr/share \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ );
+ touch $(IAXMODEM_DIR)/.spandsp_configured
+
+$(IAXMODEM_DIR)/.spandsp_built: $(IAXMODEM_DIR)/.spandsp_configured
+ $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/spandsp
+ touch $(IAXMODEM_DIR)/.spandsp_built
+
+$(IAXMODEM_DIR)/.spandsp_installed: $(IAXMODEM_DIR)/.spandsp_built
+ make -C $(IAXMODEM_DIR)/lib/spandsp DESTDIR=$(TARGET_DIR) install
+ cp -r $(TARGET_DIR)/usr/include/* $(STAGING_DIR)/usr/include
+ rm -rf $(TARGET_DIR)/usr/include
+ rm -f $(TARGET_DIR)/usr/lib/libspandsp*.a $(TARGET_DIR)/usr/lib/libspandsp*.la
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libspandsp*
+ touch $(IAXMODEM_DIR)/.spandsp_installed
+
+$(IAXMODEM_DIR)/.libiax2_configured: $(IAXMODEM_DIR)/.spandsp_installed
+ (cd $(IAXMODEM_DIR)/lib/libiax2; rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+ LDFLAGS="-L$(TARGET_DIR)/usr/lib" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --datadir=/usr/share \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ );
+ touch $(IAXMODEM_DIR)/.libiax2_configured
+
+$(IAXMODEM_DIR)/.libiax2_built: $(IAXMODEM_DIR)/.libiax2_configured
+ $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/libiax2
+ touch $(IAXMODEM_DIR)/.libiax2_built
+
+$(IAXMODEM_DIR)/.libiax2_installed: $(IAXMODEM_DIR)/.libiax2_built
+ make -C $(IAXMODEM_DIR)/lib/libiax2 DESTDIR=$(TARGET_DIR) install
+ mkdir -p $(STAGING_DIR)/usr/include/iax
+ cp $(IAXMODEM_DIR)/lib/libiax2/src/iax-client.h $(STAGING_DIR)/usr/include/iax
+ cp $(IAXMODEM_DIR)/lib/libiax2/src/iax2.h $(STAGING_DIR)/usr/include/iax
+ cp $(IAXMODEM_DIR)/lib/libiax2/src/frame.h $(STAGING_DIR)/usr/include/iax
+ cp $(IAXMODEM_DIR)/lib/libiax2/src/iax2-parser.h $(STAGING_DIR)/usr/include/iax
+ rm -f $(TARGET_DIR)/usr/lib/libiax*.a $(TARGET_DIR)/usr/lib/libiax*.la
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libiax*
+ touch $(IAXMODEM_DIR)/.libiax2_installed
+
+$(IAXMODEM_DIR)/.built: $(IAXMODEM_DIR)/.libiax2_installed
+ (cd $(IAXMODEM_DIR); \
+ $(TARGET_CC) -Wall -g -O2 -D_GNU_SOURCE -I$(STAGING_DIR)/usr/include -L$(TARGET_DIR)/usr/lib -lm -liax -lutil -lspandsp -ltiff -o iaxmodem iaxmodem.c \
+ );
+
+$(IAXMODEM_DIR)/.installed: $(IAXMODEM_DIR)/.built
+ install -D -m 0755 $(IAXMODEM_BINARY) $(IAXMODEM_TARGET_BINARY)
+ $(STRIP) --strip-unneeded $(IAXMODEM_TARGET_BINARY)
+ mkdir -p $(TARGET_DIR)/stat/etc/iaxmodem
+ cp $(IAXMODEM_DIR)/iaxmodem-cfg.ttyIAX $(TARGET_DIR)/stat/etc/iaxmodem
+ touch $(IAXMODEM_DIR)/.built
+
+iaxmodem: uclibc libtiff $(IAXMODEM_DIR)/.installed
+
+iaxmodem-clean:
+ $(MAKE) -C $(IAXMODEM_DIR)/lib/spandsp clean
+ $(MAKE) -C $(IAXMODEM_DIR)/lib/libiax2 clean
+ rm $(IAXMODEM_DIR)/iaxmodem
+ rm $(IAXMODEM_DIR)/iaxmodem.o
+
+iaxmodem-dirclean:
+ rm -rf $(IAXMODEM_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_IAXMODEM)),y)
+TARGETS+=iaxmodem
+endif
Copied: trunk/package/libtiff (from rev 414, branches/ischraub/package/libtiff)
Deleted: trunk/package/libtiff/Config.in
===================================================================
--- branches/ischraub/package/libtiff/Config.in 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/libtiff/Config.in 2006-10-18 21:27:47 UTC (rev 415)
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_LIBTIFF
- bool "libtiff"
- default n
- help
- Library for handling TIFF images.
-
- http://www.remotesensing.org/libtiff/
Copied: trunk/package/libtiff/Config.in (from rev 414, branches/ischraub/package/libtiff/Config.in)
===================================================================
--- trunk/package/libtiff/Config.in (rev 0)
+++ trunk/package/libtiff/Config.in 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBTIFF
+ bool "libtiff"
+ default n
+ help
+ Library for handling TIFF images.
+
+ http://www.remotesensing.org/libtiff/
Deleted: trunk/package/libtiff/libtiff.mk
===================================================================
--- branches/ischraub/package/libtiff/libtiff.mk 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/libtiff/libtiff.mk 2006-10-18 21:27:47 UTC (rev 415)
@@ -1,61 +0,0 @@
-#############################################################
-#
-# libtiff (TIFF library)
-#
-#############################################################
-
-LIBTIFF_VER:=3.8.2
-LIBTIFF_DIR:=$(BUILD_DIR)/tiff-$(LIBTIFF_VER)
-LIBTIFF_SITE:=ftp://ftp.remotesensing.org/pub/libtiff
-LIBTIFF_SOURCE:=tiff-$(LIBTIFF_VER).tar.gz
-LIBTIFF_CAT:=zcat
-LIBTIFF_BINARY:libtiff.la
-LIBTIFF_TARGET_BINARY:=usr/lib/libtiff.so
-
-$(DL_DIR)/$(LIBTIFF_SOURCE):
- $(WGET) -P $(DL_DIR) $(LIBTIFF_SITE)/$(LIBTIFF_SOURCE)
-
-libtiff-unpacked: $(LIBTIFF_DIR)/.unpacked
-$(LIBTIFF_DIR)/.unpacked: $(DL_DIR)/$(LIBTIFF_SOURCE)
- $(LIBTIFF_CAT) $(DL_DIR)/$(LIBTIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(LIBTIFF_DIR)/.unpacked
-
-$(LIBTIFF_DIR)/.configured: $(LIBTIFF_DIR)/.unpacked
- (cd $(LIBTIFF_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --disable-debug \
- --disable-build-docs \
- );
- touch $(LIBTIFF_DIR)/.configured
-
-$(LIBTIFF_DIR)/$(LIBTIFF_BINARY): $(LIBTIFF_DIR)/.configured
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBTIFF_DIR)
-
-$(TARGET_DIR)/$(LIBTIFF_TARGET_BINARY): $(LIBTIFF_DIR)/$(LIBTIFF_BINARY)
- make -C $(LIBTIFF_DIR) DESTDIR=$(TARGET_DIR) install
- rm -f $(TARGET_DIR)/usr/lib/libtiff*.a $(TARGET_DIR)/usr/lib/libtiff*.la
- rm -rf $(TARGET_DIR)/usr/man
- cp $(LIBTIFF_DIR)/libtiff/*.h $(STAGING_DIR)/usr/include
-
-tiff libtiff: uclibc $(TARGET_DIR)/$(LIBTIFF_TARGET_BINARY)
-
-libtiff-clean:
- rm -f $(TARGET_DIR)/$(LIBTIFF_TARGET_BINARY)
- -$(MAKE) -C $(LIBTIFF_DIR) clean
-
-libtiff-dirclean:
- rm -rf $(LIBTIFF_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIBTIFF)),y)
-TARGETS+=libtiff
-endif
Copied: trunk/package/libtiff/libtiff.mk (from rev 414, branches/ischraub/package/libtiff/libtiff.mk)
===================================================================
--- trunk/package/libtiff/libtiff.mk (rev 0)
+++ trunk/package/libtiff/libtiff.mk 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,61 @@
+#############################################################
+#
+# libtiff (TIFF library)
+#
+#############################################################
+
+LIBTIFF_VER:=3.8.2
+LIBTIFF_DIR:=$(BUILD_DIR)/tiff-$(LIBTIFF_VER)
+LIBTIFF_SITE:=ftp://ftp.remotesensing.org/pub/libtiff
+LIBTIFF_SOURCE:=tiff-$(LIBTIFF_VER).tar.gz
+LIBTIFF_CAT:=zcat
+LIBTIFF_BINARY:libtiff.la
+LIBTIFF_TARGET_BINARY:=usr/lib/libtiff.so
+
+$(DL_DIR)/$(LIBTIFF_SOURCE):
+ $(WGET) -P $(DL_DIR) $(LIBTIFF_SITE)/$(LIBTIFF_SOURCE)
+
+libtiff-unpacked: $(LIBTIFF_DIR)/.unpacked
+$(LIBTIFF_DIR)/.unpacked: $(DL_DIR)/$(LIBTIFF_SOURCE)
+ $(LIBTIFF_CAT) $(DL_DIR)/$(LIBTIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(LIBTIFF_DIR)/.unpacked
+
+$(LIBTIFF_DIR)/.configured: $(LIBTIFF_DIR)/.unpacked
+ (cd $(LIBTIFF_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --disable-debug \
+ --disable-build-docs \
+ );
+ touch $(LIBTIFF_DIR)/.configured
+
+$(LIBTIFF_DIR)/$(LIBTIFF_BINARY): $(LIBTIFF_DIR)/.configured
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBTIFF_DIR)
+
+$(TARGET_DIR)/$(LIBTIFF_TARGET_BINARY): $(LIBTIFF_DIR)/$(LIBTIFF_BINARY)
+ make -C $(LIBTIFF_DIR) DESTDIR=$(TARGET_DIR) install
+ rm -f $(TARGET_DIR)/usr/lib/libtiff*.a $(TARGET_DIR)/usr/lib/libtiff*.la
+ rm -rf $(TARGET_DIR)/usr/man
+ cp $(LIBTIFF_DIR)/libtiff/*.h $(STAGING_DIR)/usr/include
+
+tiff libtiff: uclibc $(TARGET_DIR)/$(LIBTIFF_TARGET_BINARY)
+
+libtiff-clean:
+ rm -f $(TARGET_DIR)/$(LIBTIFF_TARGET_BINARY)
+ -$(MAKE) -C $(LIBTIFF_DIR) clean
+
+libtiff-dirclean:
+ rm -rf $(LIBTIFF_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_LIBTIFF)),y)
+TARGETS+=libtiff
+endif
Modified: trunk/package/usbutils/usbutils.mk
===================================================================
--- trunk/package/usbutils/usbutils.mk 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/package/usbutils/usbutils.mk 2006-10-18 21:27:47 UTC (rev 415)
@@ -33,14 +33,16 @@
);
touch $(USBUTILS_DIR)/.configured
-$(USBUTILS_DIR)/$(USBUTILS_BINARY): $(USBUTILS_DIR)/.configured
+$(USBUTILS_DIR)/.built: $(USBUTILS_DIR)/.configured
$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(USBUTILS_DIR)
+ touch $(USBUTILS_DIR)/.built
-$(TARGET_DIR)/$(USBUTILS_TARGET_BINARY): $(USBUTILS_DIR)/$(USBUTILS_BINARY)
+$(USBUTILS_DIR)/.installed: $(USBUTILS_DIR)/.built
make -C $(USBUTILS_DIR) DESTDIR=$(TARGET_DIR) install
rm -rf $(TARGET_DIR)/usr/man
+ touch $(USBUTILS_DIR)/.installed
-usbutils: uclibc libusb $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY)
+usbutils: uclibc libusb $(USBUTILS_DIR)/.installed
usbutils-clean:
rm -f $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY)
Copied: trunk/target/generic/target_skeleton/etc/init.d/iaxmodem (from rev 414, branches/ischraub/target/generic/target_skeleton/etc/init.d/iaxmodem)
===================================================================
--- trunk/target/generic/target_skeleton/etc/init.d/iaxmodem (rev 0)
+++ trunk/target/generic/target_skeleton/etc/init.d/iaxmodem 2006-10-18 21:27:47 UTC (rev 415)
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+if [ ! -d /var/log/iaxmodem ]
+then
+mkdir /var/log/iaxmodem
+fi
+
+if [ -d /mnt/kd/iaxmodem ]
+then
+ln -s /mnt/kd/iaxmodem /tmp/etc/iaxmodem
+else
+mkdir /tmp/etc/iaxmodem
+cp -a /stat/etc/iaxmodem/* /tmp/etc/iaxmodem/
+fi
+}
+
+start () {
+echo "Starting IAXmodem..."
+iaxmodem
+fi
+}
+
+stop () {
+if [ -r /var/run/iaxmodem.pid ]
+then
+echo "Stopping IAXmodem..."
+kill `cat /var/run/iaxmodem.pid`
+fi
+}
+
+case $1 in
+
+init)
+init
+start
+;;
+
+start)
+start
+;;
+
+stop)
+stop
+;;
+
+restart)
+stop
+sleep 2
+start
+;;
+
+*)
+echo "Usage: start|stop|restart"
+;;
+
+esac
Modified: trunk/target/generic/target_skeleton/etc/init.d/misc
===================================================================
--- trunk/target/generic/target_skeleton/etc/init.d/misc 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/target/generic/target_skeleton/etc/init.d/misc 2006-10-18 21:27:47 UTC (rev 415)
@@ -34,12 +34,20 @@
port $PORT
maildomain $DOMAIN" > /tmp/etc/msmtprc
-if [ "$SMTP_TLS" -a "$SMTP_CA" ]
+if [ "$SMTP_TLS" ]
then
-echo "tls on
-tls_trust_file $SMTP_CA" >> /tmp/etc/msmtprc
+echo "tls on" >> /tmp/etc/msmtprc
+
+if [ "$SMTP_CA" ]
+then
+echo "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
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2006-10-18 08:19:17 UTC (rev 414)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2006-10-18 21:27:47 UTC (rev 415)
@@ -427,10 +427,11 @@
##The from hostname of SMTP messages.
#SMTP_HOSTNAME="pbx"
-##If SMTP_TLS is defined, we will use TLS. You also need to set SMTP_CA
+##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!
##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.
|
