Project "Tuxbox-GIT: cdk":
The branch, master has been updated
via 038bf2347a8002bb80b7be4c5ffb54f40128fdc9 (commit)
via fe58be38a0665f257042caa965997815dda83e39 (commit)
via 879ea422a359f35b81592e0f3e2fcb3bb3e88005 (commit)
via 7a705bae8fde96084aef551eff5675a425676a8c (commit)
from c5ac465d346eba22f3797977d8a8e7786c7978c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 038bf2347a8002bb80b7be4c5ffb54f40128fdc9
Author: GetAway <get-a...@t-online.de>
Date: Fri Sep 12 11:11:04 2014 +0200
Port CS-tuxmail SSL Support
Signed-off-by: GetAway <get-a...@t-online.de>
Signed-off-by: Thilo Graf <d...@novatux.de>
diff --git a/configure.ac b/configure.ac
index fa84317..d000f97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -784,6 +784,12 @@ AM_CONDITIONAL(ENABLE_WGET,test "$enable_wget" = "yes")
AC_ARG_WITH(ssl,
AS_HELP_STRING(--with-ssl,build image with OpenSSL - use it for
standalone wget & links),
[enable_ssl="$withval"],[enable_ssl=no])
+if test "$enable_tuxmail" = "yes"; then
+ if test "$enable_ssl" = "no"; then
+ summary_plugins="/ tuxmail"
+ fi
+ enable_ssl=yes
+fi
AM_CONDITIONAL(ENABLE_SSL,test "$enable_ssl" = "yes")
AC_ARG_ENABLE(enigma-dbswitch,
@@ -1795,7 +1801,7 @@ Neutrino EPG plus $enable_epgplus
Radiotext support: $enable_radiotext
FLAC support: $enable_flac
CURL version: $with_curlversion
-OpenSSL: $enable_ssl
+OpenSSL: $enable_ssl $summary_plugins
German keymaps: $enable_german_keymaps
aformat $enable_aformat
diff --git a/make/plugins.mk b/make/plugins.mk
index f00b57f..900b2aa 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -17,11 +17,11 @@ $(targetprefix)/lib/pkgconfig/tuxbox-plugins.pc:
$(appsdir)/tuxbox/plugins/confi
$(MAKE) -C $(appsdir)/tuxbox/plugins/include install
cp $(appsdir)/tuxbox/plugins/tuxbox-plugins.pc
$(targetprefix)/lib/pkgconfig/tuxbox-plugins.pc
-tuxmail: $(appsdir)/tuxbox/plugins/config.status
+tuxmail: libcrypto $(appsdir)/tuxbox/plugins/config.status
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxmail all
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxmail install
-flash-tuxmail: $(appsdir)/tuxbox/plugins/config.status | $(flashprefix)/root
+flash-tuxmail: libcrypto $(appsdir)/tuxbox/plugins/config.status |
$(flashprefix)/root
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxmail all
prefix=$(flashprefix)/root
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxmail install
prefix=$(flashprefix)/root
@FLASHROOTDIR_MODIFIED@
commit fe58be38a0665f257042caa965997815dda83e39
Author: rhabarber1848 <rhabarber1...@cvs.tuxbox.org>
Date: Wed Sep 10 10:21:29 2014 +0200
optional ssl for wget and links bump version openssl-0.9.8zb
Signed-off-by: GetAway <get-a...@t-online.de>
Signed-off-by: Thilo Graf <d...@novatux.de>
diff --git a/Patches/libcrypto.diff b/Patches/libcrypto.diff
index 4786c0c..4086e81 100644
--- a/Patches/libcrypto.diff
+++ b/Patches/libcrypto.diff
@@ -1,76 +1,71 @@
-diff -u openssl-0.9.7d.old/Configure openssl-0.9.7d.new/Configure
---- openssl-0.9.7d.old/Configure 2004-03-12 22:24:44.000000000 +0100
-+++ openssl-0.9.7d.new/Configure 2004-05-13 19:05:38.000000000 +0200
-@@ -557,6 +557,9 @@
+diff -u -pr openssl-0.9.8zb-orig/Configure openssl-0.9.8zb-mod/Configure
+--- openssl-0.9.8zb-orig/Configure 2014-08-06 23:27:40.000000000 +0200
++++ openssl-0.9.8zb-mod/Configure 2014-09-09 14:39:16.000000000 +0200
+@@ -546,6 +546,9 @@ my %table=(
##### OS/2 EMX
"OS2-EMX", "gcc::::::::",
+##### Tuxbox
-+"tuxbox", "__TUXBOX_CC__:-DB_ENDIAN -DTERMIO __TUXBOX_CFLAGS__
-fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK
DES_RISC1
DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"tuxbox", "__TUXBOX_CC__:-DB_ENDIAN -DTERMIO __TUXBOX_CFLAGS__
-fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK
DES_RISC1 DES_UNROLL
BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
##### VxWorks for various targets
"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405
-I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
"vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile
-fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall
-DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
---- openssl-0.9.7d.old/Makefile.org 2004-03-12 22:33:04.000000000 +0100
-+++ openssl-0.9.7d.new/Makefile.org 2004-05-13 19:10:12.000000000 +0200
-@@ -173,7 +173,7 @@
- # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
- SHLIB_MARK=
+Nur in openssl-0.9.8zb-mod: Configure.orig.
+diff -u -pr openssl-0.9.8zb-orig/Makefile.org openssl-0.9.8zb-mod/Makefile.org
+--- openssl-0.9.8zb-orig/Makefile.org 2014-08-06 23:27:40.000000000 +0200
++++ openssl-0.9.8zb-mod/Makefile.org 2014-09-09 14:50:18.000000000 +0200
+@@ -132,8 +132,8 @@ FIPSCANLIB=
--DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools
+ BASEADDR=
+
+-DIRS= crypto fips ssl engines apps test tools
+-SHLIBDIRS= crypto ssl fips
+DIRS= crypto ssl
- SHLIBDIRS= fips crypto ssl
++SHLIBDIRS= crypto ssl
# dirs in crypto to build
-@@ -883,4 +883,51 @@
+ SDIRS= \
+@@ -727,4 +727,42 @@ install_docs:
done); \
done
+install_cdk:
-+ @mkdir -p \
-+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
-+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
-+ $(INSTALL_PREFIX)$(OPENSSLDIR)/lib
-+ @for i in $(EXHEADER) ;\
++ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl
++ @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+ do \
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ done;
-+ @for i in $(DIRS) ;\
-+ do \
-+ if [ -d "$$i" ]; then \
-+ (cd $$i; echo "installing $$i..."; \
-+ $(MAKE) CC='${CC}' CFLAG='${CFLAG}'
INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}'
OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}'
RANLIB='${RANLIB}' EXE_EXT='${EXE_EXT}' install ); \
-+ fi; \
-+ done
-+ @for i in $(LIBS) ;\
++ @set -e; target=install; $(RECURSIVE_BUILD_CMD)
++ @set -e; for i in $(LIBS) ;\
+ do \
+ if [ -f "$$i" ]; then \
+ ( echo installing $$i; \
-+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-+ $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
-+ j=$$(echo $$i | sed -e 's/\.a//'); ln -sf
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$j.a $$j_pic.a ); \
++ cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ $(RANLIB)
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ fi; \
+ done;
-+ @if [ -n "$(SHARED_LIBS)" ]; then \
++ @set -e; if [ -n "$(SHARED_LIBS)" ]; then \
+ tmp="$(SHARED_LIBS)"; \
+ for i in $${tmp:-x}; \
+ do \
+ if [ -f "$$i" -o -f "$$i.a" ]; then \
+ ( echo installing $$i; \
-+ cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-+ chmod 555
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-+ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++ cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 555
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ fi; \
+ done; \
+ ( here="`pwd`"; \
-+ cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-+ set $(MAKE); \
-+ $$1 -f $$here/Makefile link-shared ); \
++ cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
++ $(MAKE) -f $$here/Makefile HERE="$$here" link-shared );
\
+ fi
-+ cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
-+
+
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/configure.ac b/configure.ac
index a75a288..fa84317 100644
--- a/configure.ac
+++ b/configure.ac
@@ -781,6 +781,11 @@ AC_ARG_WITH(wget,
[enable_wget="$withval"],[enable_wget=no])
AM_CONDITIONAL(ENABLE_WGET,test "$enable_wget" = "yes")
+AC_ARG_WITH(ssl,
+ AS_HELP_STRING(--with-ssl,build image with OpenSSL - use it for
standalone wget & links),
+ [enable_ssl="$withval"],[enable_ssl=no])
+AM_CONDITIONAL(ENABLE_SSL,test "$enable_ssl" = "yes")
+
AC_ARG_ENABLE(enigma-dbswitch,
AS_HELP_STRING(--disable-enigma-dbswitch,disable Enigma dbswitch),
,[enable_enigma_dbswitch=yes])
@@ -1790,6 +1795,7 @@ Neutrino EPG plus $enable_epgplus
Radiotext support: $enable_radiotext
FLAC support: $enable_flac
CURL version: $with_curlversion
+OpenSSL: $enable_ssl
German keymaps: $enable_german_keymaps
aformat $enable_aformat
diff --git a/make/contrib-apps.mk b/make/contrib-apps.mk
index 5ca2fe6..6f799e6 100644
--- a/make/contrib-apps.mk
+++ b/make/contrib-apps.mk
@@ -7,6 +7,16 @@ contrib_apps: bzip2 console_data kbd fbset lirc lsof dropbear
ssh tcpdump bonnie
CONTRIB_DEPSCLEANUP = rm -f .deps/bzip2 .deps/console_data .deps/kbd
.deps/directfb_examples .deps/fbset .deps/lirc .deps/lsof .deps/ssh
.deps/tcpdump .deps/bonnie .deps/vdr .deps/lufs .deps/dropbear .deps/kermit
.deps/wget .deps/ncftp .deps/screen .deps/lzma .deps/lzma_host .deps/ntpd
.deps/ntpclient .deps/links .deps/links_g .deps/esound .deps/openntpd
.deps/python .deps/ser2net .deps/ipkg .deps/openvpn .deps/htop .deps/netio
.deps/netio_host
+if ENABLE_SSL
+SSL_DEPS=libcrypto
+SSL_WGET_OPTS=--with-ssl=openssl
+SSL_LINKS_OPTS=--with-ssl=$(targetprefix)
+else
+SSL_DEPS=
+SSL_WGET_OPTS=--without-ssl
+SSL_LINKS_OPTS=--without-ssl
+endif
+
#bzip2
$(DEPDIR)/bzip2: bootstrap @DEPENDS_bzip2@
@PREPARE_bzip2@
@@ -364,7 +374,7 @@ $(DEPDIR)/kermit: bootstrap @DEPENDS_kermit@ libcrypto
Patches/kermit.diff
touch $@
#wget
-$(DEPDIR)/wget: bootstrap @DEPENDS_wget@
+$(DEPDIR)/wget: bootstrap libz $(SSL_DEPS) @DEPENDS_wget@
@PREPARE_wget@
cd @DIR_wget@ && \
$(BUILDENV) \
@@ -375,6 +385,7 @@ $(DEPDIR)/wget: bootstrap @DEPENDS_wget@
--disable-nls \
--disable-opie \
--disable-digest \
+ $(SSL_WGET_OPTS) \
--prefix=&& \
$(MAKE) all && \
@INSTALL_wget@
@@ -486,7 +497,7 @@ $(flashprefix)/root/bin/links: $(DEPDIR)/links |
$(flashprefix)/root
$(INSTALL) $(targetprefix)/bin/links $(flashprefix)/root/bin
@FLASHROOTDIR_MODIFIED@
-$(DEPDIR)/links_g: bootstrap libdirectfb kb2rcd links-plugin @DEPENDS_links_g@
+$(DEPDIR)/links_g: bootstrap libdirectfb kb2rcd links-plugin $(SSL_DEPS)
@DEPENDS_links_g@
@PREPARE_links_g@
cd @DIR_links_g@ && \
$(BUILDENV_BIN) \
@@ -496,6 +507,7 @@ $(DEPDIR)/links_g: bootstrap libdirectfb kb2rcd
links-plugin @DEPENDS_links_g@
--prefix= \
--enable-graphics \
--without-x \
+ $(SSL_LINKS_OPTS) \
--oldincludedir=$(targetprefix)/include:$(targetprefix)/include/directfb && \
$(MAKE) all && \
@INSTALL_links_g@
diff --git a/make/contrib-libs.mk b/make/contrib-libs.mk
index 95acb47..a4fc7a3 100644
--- a/make/contrib-libs.mk
+++ b/make/contrib-libs.mk
@@ -42,20 +42,23 @@ $(DEPDIR)/libcommoncplusplus: bootstrap libxml2
@DEPENDS_libcommoncplusplus@
@CLEANUP_libcommoncplusplus@
touch $@
-if !ENABLE_OPENVPN
-OPENVPN_NOMD4=no-md4
-endif
-$(DEPDIR)/libcrypto: bootstrap @DEPENDS_libcrypto@
+$(DEPDIR)/libcrypto: bootstrap libz @DEPENDS_libcrypto@
@PREPARE_libcrypto@
cd @DIR_libcrypto@ && \
sed -e 's|__TUXBOX_CC__|$(target)-gcc|' -e
's|__TUXBOX_CFLAGS__|$(TARGET_CFLAGS)|' ./Configure > ./Configure.tuxbox && \
$(BUILDENV) \
- sh ./Configure.tuxbox shared no-hw no-idea no-md2
$(OPENVPN_NOMD4) no-mdc2 no-rc2 no-rc5 tuxbox --prefix=/ --openssldir=/ && \
- $(MAKE) depend && \
- $(MAKE) all && \
+ sh ./Configure.tuxbox \
+ -DOPENSSL_SMALL_FOOTPRINT \
+ shared no-ec no-err no-engine no-hw zlib-dynamic \
+ no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \
+ no-rmd160 no-aes192 no-ripemd no-camellia no-ans1
no-krb5 \
+ tuxbox --prefix=/ --openssldir=/ && \
+ $(MAKE) depend MAKEDEPPROG=$(target)-gcc
ZLIB_INCLUDE="-I$(targetprefix)/include" && \
+ $(MAKE) -j1 all && \
@INSTALL_libcrypto@
- rm -f $(targetprefix)/lib/pkgconfig/openssl.pc && \
sed -e "s,^prefix=,prefix=$(targetprefix)," <
@DIR_libcrypto@/openssl.pc > $(targetprefix)/lib/pkgconfig/openssl.pc && \
+ sed -e "s,^prefix=,prefix=$(targetprefix)," <
@DIR_libcrypto@/libcrypto.pc > $(targetprefix)/lib/pkgconfig/libcrypto.pc && \
+ sed -e "s,^prefix=,prefix=$(targetprefix)," < @DIR_libcrypto@/libssl.pc
> $(targetprefix)/lib/pkgconfig/libssl.pc && \
@CLEANUP_libcrypto@
touch $@
diff --git a/rules-archive b/rules-archive
index a4e9f5e..e347057 100644
--- a/rules-archive
+++ b/rules-archive
@@ -69,7 +69,7 @@
squashfs2.2r2.tar.gz;http://prdownloads.sourceforge.net/sourceforge/squashfs
#
# contrib libs
#
-openssl-0.9.7e.tar.gz;http://www.openssl.org/source
+openssl-0.9.8zb.tar.gz;http://www.openssl.org/source
curl-7.10.1.tar.gz;http://curl.haxx.se/download/archeology
curl-7.20.0.tar.bz2;http://curl.haxx.se/download
freetype-2.3.12.tar.bz2;http://prdownloads.sourceforge.net/sourceforge/freetype
@@ -124,7 +124,7 @@
dropbear-0.52.tar.bz2;http://www.ucc.asn.au/~matt/dropbear/releases
cku211.tar.gz;ftp://kermit.columbia.edu/kermit/archives
libtool-1.5.22.tar.gz;ftp://ftp.gnu.org/gnu/libtool
samba-2.0.10.tar.gz;http://samba.org/samba/ftp/old-versions
-wget-1.11.4.tar.bz2;http://ftp.gnu.org/pub/gnu/wget
+wget-1.13.4.tar.bz2;http://ftp.gnu.org/pub/gnu/wget
ncftp-3.2.2-src.tar.bz2;ftp://ftp.ncftp.com/ncftp
screen-4.0.3.tar.gz;ftp://ftp.gnu.org/pub/gnu/screen
links-1.00.tar.gz;http://www.jikos.cz/~mikulas/links//download
diff --git a/rules-install b/rules-install
index 14b6577..b926228 100644
--- a/rules-install
+++ b/rules-install
@@ -53,7 +53,7 @@ udev;make:install:DESTDIR=TARGET
# contrib libs
#
libboost;remove:TARGET/include/boost;move:boost:TARGET/include/boost
-libcrypto;install:libcrypto.a:TARGET/lib/libcrypto_pic.a;install:libssl.a:TARGET/lib/libssl_pic.a;make:install_cdk:INSTALL_PREFIX=TARGET:INSTALLTOP=
+libcrypto;install:libcrypto.a:TARGET/lib/libcrypto_pic.a;install:libssl.a:TARGET/lib/libssl_pic.a;make:install_cdk:INSTALL_PREFIX=TARGET:INSTALLTOP=/
libcurl;make:install:DESTDIR=TARGET;archive:TARGET/lib/libcurl_pic.a:lib/*.lo;rewrite-libtool:TARGET/lib/libcurl.la
libcurl_current;make:install:DESTDIR=TARGET;archive:TARGET/lib/libcurl_pic.a:lib/*.o;rewrite-libtool:TARGET/lib/libcurl.la
libcommoncplusplus;make:install:DESTDIR=TARGET;rewrite-libtool:TARGET/lib/libccext2.la;rewrite-libtool:TARGET/lib/libccgnu2.la
diff --git a/rules-make b/rules-make
index a2a01d7..fd562a8 100644
--- a/rules-make
+++ b/rules-make
@@ -62,7 +62,7 @@
squashfs;3.0;mksquashfs;squashfs3.0.tar.gz:mksquashfs_lzma.diff:lzma442.tar.bz2:
#
libboost;boost-1.53.0;boost_1_53_0;boost_1_53_0.tar.bz2;extract:boost_1_53_0.tar.bz2
libcommoncplusplus;1.0.13;commoncpp2-1.0.13;commoncpp2-1.0.13.tar.gz:libcommoncplusplus.diff;extract:commoncpp2-1.0.13.tar.gz;patch:libcommoncplusplus.diff
-libcrypto;0.9.7e;openssl-0.9.7e;openssl-0.9.7e.tar.gz:libcrypto.diff;extract:openssl-0.9.7e.tar.gz;patch:libcrypto.diff
+libcrypto;0.9.8zb;openssl-0.9.8zb;openssl-0.9.8zb.tar.gz:libcrypto.diff;extract:openssl-0.9.8zb.tar.gz;patch:libcrypto.diff
libcurl;7.10.1;curl-7.10.1;curl-7.10.1.tar.gz:libcurl.diff;extract:curl-7.10.1.tar.gz;patch:libcurl.diff
libcurl_current;7.20.0;curl-7.20.0;curl-7.20.0.tar.bz2;extract:curl-7.20.0.tar.bz2
libdirectfb;1.0.0;DirectFB-1.0.0;DirectFB-1.0.0.tar.gz:libdirectfb.diff;extract:DirectFB-1.0.0.tar.gz;patch:libdirectfb.diff
@@ -116,7 +116,7 @@
dropbear;0.52;dropbear-0.52;dropbear-0.52.tar.bz2:dropbear-nopass.diff:dropbear-
kermit;8.0;c-kermit-8.0;cku211.tar.gz;dirextract:cku211.tar.gz;patch:kermit.diff
libtool;1.5.22;libtool-1.5.22;libtool-1.5.22.tar.gz;extract:libtool-1.5.22.tar.gz
samba;2.0.10;samba-2.0.10;samba-2.0.10.tar.gz:samba_ppc.diff;extract:samba-2.0.10.tar.gz;patch:samba_ppc.diff
-wget;1.11.4;wget-1.11.4;wget-1.11.4.tar.bz2;extract:wget-1.11.4.tar.bz2
+wget;1.13.4;wget-1.13.4;wget-1.13.4.tar.bz2;extract:wget-1.13.4.tar.bz2
ncftp;3.2.2;ncftp-3.2.2;ncftp-3.2.2-src.tar.bz2;extract:ncftp-3.2.2-src.tar.bz2
screen;4.0.3;screen-4.0.3;screen-4.0.3.tar.gz:screen.diff;extract:screen-4.0.3.tar.gz;patch:screen.diff
links;1.0;links-1.00;links-1.00.tar.gz;extract:links-1.00.tar.gz
commit 879ea422a359f35b81592e0f3e2fcb3bb3e88005
Author: GetAway <get-a...@t-online.de>
Date: Tue Sep 2 21:24:40 2014 +0200
bump version libpng-1.2.51
Signed-off-by: GetAway <get-a...@t-online.de>
Signed-off-by: Thilo Graf <d...@novatux.de>
diff --git a/rules-archive b/rules-archive
index ad63930..a4e9f5e 100644
--- a/rules-archive
+++ b/rules-archive
@@ -75,7 +75,7 @@ curl-7.20.0.tar.bz2;http://curl.haxx.se/download
freetype-2.3.12.tar.bz2;http://prdownloads.sourceforge.net/sourceforge/freetype
ncurses-5.3.tar.gz;ftp://$(gnuserver)/ncurses
jpegsrc.v6b.tar.gz;http://www.xfig.org/software/jpeg
-libpng-1.2.50.tar.bz2;http://prdownloads.sourceforge.net/sourceforge/libpng
+libpng-1.2.51.tar.bz2;http://prdownloads.sourceforge.net/sourceforge/libpng
libxml2-2.4.30.tar.gz;ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.4
zlib-1.2.8.tar.gz;http://zlib.net
libffi-1.20.tar.gz;ftp://sources.redhat.com/pub/libffi
diff --git a/rules-make b/rules-make
index 5876a9a..a2a01d7 100644
--- a/rules-make
+++ b/rules-make
@@ -80,7 +80,7 @@
libmad;0.15.1b;libmad-0.15.1b;libmad-0.15.1b.tar.gz:libmad.diff;extract:libmad-0
libid3tag;0.15.1b;libid3tag-0.15.1b;libid3tag-0.15.1b.tar.gz:libid3tag.diff;extract:libid3tag-0.15.1b.tar.gz;patch:libid3tag.diff
libncurses;5.3;ncurses-5.3;ncurses-5.3.tar.gz;extract:ncurses-5.3.tar.gz
libpcap;0.9.4;libpcap-0.9.4;libpcap-0.9.4.tar.gz:libpcap.diff;extract:libpcap-0.9.4.tar.gz;patch:libpcap.diff
-libpng;1.2.50;libpng-1.2.50;libpng-1.2.50.tar.bz2;extract:libpng-1.2.50.tar.bz2
+libpng;1.2.51;libpng-1.2.51;libpng-1.2.51.tar.bz2;extract:libpng-1.2.51.tar.bz2
libreadline;4.3;readline-4.3;readline-4.3.tar.gz:readline.diff;extract:readline-4.3.tar.gz;patch:readline.diff
libsdl;1.2.6;SDL-1.2.6;SDL-1.2.6.tar.gz:sdl.diff;extract:SDL-1.2.6.tar.gz;patch:sdl.diff
libsigc;2.3.1;libsigc++-2.3.1;libsigc++-2.3.1.tar.gz;extract:libsigc++-2.3.1.tar.gz
commit 7a705bae8fde96084aef551eff5675a425676a8c
Author: GetAway <get-a...@t-online.de>
Date: Sat Aug 23 09:55:12 2014 +0200
Removed obsolete libungif - switched to giflib-5.1.0
Ported some code of tuxwetter and enigma
Signed-off-by: GetAway <get-a...@t-online.de>
Signed-off-by: Thilo Graf <d...@novatux.de>
diff --git a/configure.ac b/configure.ac
index 2ae4ed3..a75a288 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1509,7 +1509,7 @@ TUXBOX_RULES_MAKE(libgmp)
TUXBOX_RULES_MAKE(libmad)
TUXBOX_RULES_MAKE(libncurses)
TUXBOX_RULES_MAKE(libjpeg)
-TUXBOX_RULES_MAKE(libungif)
+TUXBOX_RULES_MAKE(giflib)
TUXBOX_RULES_MAKE(libpcap)
TUXBOX_RULES_MAKE(libpng)
TUXBOX_RULES_MAKE(libreadline)
diff --git a/make/contrib-libs.mk b/make/contrib-libs.mk
index d0b402d..95acb47 100644
--- a/make/contrib-libs.mk
+++ b/make/contrib-libs.mk
@@ -11,7 +11,7 @@ libs: \
libs_optional: \
libffi \
libboost libgmp \
- libpcap libxml2 libungif \
+ libpcap libxml2 giflib \
libexpat libcrypto sqlite
libs_host : \
@@ -517,19 +517,19 @@ $(DEPDIR)/libglib: bootstrap @LIBGETTEXT@
@DEPENDS_libglib@
@CLEANUP_libglib@
touch $@
-$(DEPDIR)/libungif: bootstrap @DEPENDS_libungif@
- @PREPARE_libungif@
- cd @DIR_libungif@ && \
+$(DEPDIR)/giflib: bootstrap @DEPENDS_giflib@
+ @PREPARE_giflib@
+ cd @DIR_giflib@ && \
sed -i -e 's,^SUBDIRS = lib.*,SUBDIRS = lib,g' Makefile.in && \
+ export ac_cv_prog_have_xmlto=no && \
$(BUILDENV) \
./configure \
--host=$(target) \
--build=$(build) \
--prefix= \
- --without-x && \
$(MAKE) && \
- @INSTALL_libungif@
- @CLEANUP_libungif@
+ @INSTALL_giflib@
+ @CLEANUP_giflib@
touch $@
$(DEPDIR)/libiconv: bootstrap @DEPENDS_libiconv@
diff --git a/make/enigma.mk b/make/enigma.mk
index f25eeb3..b949df0 100644
--- a/make/enigma.mk
+++ b/make/enigma.mk
@@ -12,7 +12,7 @@ else
ENIGMA_DEPENDS=
endif
-$(appsdir)/tuxbox/enigma/config.status: bootstrap libfreetype libfribidi
libmad libid3tag libvorbisidec libpng libsigc libjpeg libungif @LIBGETTEXT@
$(ENIGMA_DEPENDS) $(targetprefix)/lib/pkgconfig/tuxbox.pc
$(targetprefix)/lib/pkgconfig/tuxbox-xmltree.pc
$(targetprefix)/include/tuxbox/plugin.h
+$(appsdir)/tuxbox/enigma/config.status: bootstrap libfreetype libfribidi
libmad libid3tag libvorbisidec libpng libsigc libjpeg giflib @LIBGETTEXT@
$(ENIGMA_DEPENDS) $(targetprefix)/lib/pkgconfig/tuxbox.pc
$(targetprefix)/lib/pkgconfig/tuxbox-xmltree.pc
$(targetprefix)/include/tuxbox/plugin.h
cd $(appsdir)/tuxbox/enigma && $(CONFIGURE_BIN) \
--with-webif=$(WEBIF) \
--with-epg=$(EPG) \
diff --git a/make/plugins.mk b/make/plugins.mk
index 489f47e..f00b57f 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -138,11 +138,11 @@ if ENABLE_TUXWETTER
endif
@FLASHROOTDIR_MODIFIED@
-tuxwetter: libungif input $(appsdir)/tuxbox/plugins/config.status
+tuxwetter: giflib input $(appsdir)/tuxbox/plugins/config.status
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxwetter all
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxwetter install
-flash-tuxwetter: libungif flash-input $(appsdir)/tuxbox/plugins/config.status
| $(flashprefix)/root
+flash-tuxwetter: giflib flash-input $(appsdir)/tuxbox/plugins/config.status |
$(flashprefix)/root
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxwetter all
prefix=$(flashprefix)/root
$(MAKE) -C $(appsdir)/tuxbox/plugins/tuxwetter install
prefix=$(flashprefix)/root
@FLASHROOTDIR_MODIFIED@
diff --git a/rules-archive b/rules-archive
index 65acb67..ad63930 100644
--- a/rules-archive
+++ b/rules-archive
@@ -97,7 +97,7 @@
gmp-4.1.2.tar.bz2;ftp://ftp.informatik.rwth-aachen.de/pub/gnu/gmp
libmad-0.15.1b.tar.gz;http://prdownloads.sourceforge.net/sourceforge/mad
libid3tag-0.15.1b.tar.gz;http://prdownloads.sourceforge.net/sourceforge/mad
glib-2.8.3.tar.gz;http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.8
-libungif-4.1.4.tar.bz2;http://prdownloads.sourceforge.net/sourceforge/giflib
+giflib-5.1.0.tar.bz2;http://prdownloads.sourceforge.net/sourceforge/giflib
libiconv-1.9.1.tar.gz;http://ftp.gnu.org/pub/gnu/libiconv
flac-1.2.0.tar.gz;http://prdownloads.sourceforge.net/sourceforge/flac
gettext-0.17.tar.gz;http://ftp.gnu.org/pub/gnu/gettext
diff --git a/rules-install b/rules-install
index 6152137..14b6577 100644
--- a/rules-install
+++ b/rules-install
@@ -80,7 +80,7 @@
libvorbisidec;rewrite-pkgconfig:vorbisidec.pc;make:install:DESTDIR=TARGET;instal
libxml2;rewrite-pkgconfig:libxml-2.0.pc;make:install:DESTDIR=TARGET;rewrite-libtool:TARGET/lib/libxml2.la
libz;make:install:prefix=TARGET;archive:TARGET/lib/libz_pic.a:*.o
libglib;make:install
-libungif;make:install:DESTDIR=TARGET;rewrite-libtool:TARGET/lib/libungif.la
+giflib;make:install:DESTDIR=TARGET;rewrite-libtool:TARGET/lib/giflib.la
libiconv;make:install:DESTDIR=TARGET
libFLAC;make:install: -C src/libFLAC
DESTDIR=TARGET;rewrite-libtool:TARGET/lib/libFLAC.la
libgettext;make:install: -C intl DESTDIR=TARGET
diff --git a/rules-make b/rules-make
index 62195c1..5876a9a 100644
--- a/rules-make
+++ b/rules-make
@@ -88,7 +88,7 @@
libvorbisidec;1.0.2+svn15687;libvorbisidec-1.0.2+svn15687;libvorbisidec_1.0.2+sv
libxml2;2.4.30;libxml2-2.4.30;libxml2-2.4.30.tar.gz:libxml2.diff;extract:libxml2-2.4.30.tar.gz;patch:libxml2.diff
libz;1.2.8;zlib-1.2.8;zlib-1.2.8.tar.gz;extract:zlib-1.2.8.tar.gz
libglib;2.8.3;glib-2.8.3;glib-2.8.3.tar.gz;extract:glib-2.8.3.tar.gz
-libungif;4.1.4;libungif-4.1.4;libungif-4.1.4.tar.bz2;extract:libungif-4.1.4.tar.bz2
+giflib;5.1.0;giflib-5.1.0;giflib-5.1.0.tar.bz2;extract:giflib-5.1.0.tar.bz2
libiconv;1.9.1;libiconv-1.9.1;libiconv-1.9.1.tar.gz;extract:libiconv-1.9.1.tar.gz
libFLAC;1.2.0;flac-1.2.0;flac-1.2.0.tar.gz;extract:flac-1.2.0.tar.gz;patch:flac.diff
libgettext;0.17;gettext-0.17;gettext-0.17.tar.gz:gettext.diff;extract:gettext-0.17.tar.gz;patch:gettext.diff
-----------------------------------------------------------------------
Summary of changes:
Patches/libcrypto.diff | 75 ++++++++++++++++++++++-------------------------
configure.ac | 14 ++++++++-
make/contrib-apps.mk | 16 +++++++++-
make/contrib-libs.mk | 33 +++++++++++---------
make/enigma.mk | 2 +-
make/plugins.mk | 8 ++--
rules-archive | 8 ++--
rules-install | 4 +-
rules-make | 8 ++--
9 files changed, 95 insertions(+), 73 deletions(-)
--
Tuxbox-GIT: cdk
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Tuxbox-cvs-commits mailing list
Tuxbox-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
