From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:20:09 +0200 Subject: Revert "fix conflict, autoseect libgcj" This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04. --- TODO | 11 +- mk/build.mk | 4 +- package/.template/Makefile | 6 +- package/ImageMagick/Makefile | 1 - package/MesaLib/Makefile | 2 - package/apr/Makefile | 2 - package/autoconf/Makefile | 2 +- package/beecrypt/Makefile | 5 +- package/bind/Makefile | 1 - package/binutils/Makefile | 1 - package/bluez/Makefile | 1 - package/cacaovm/Makefile | 50 - package/cacaovm/patches/patch-src_cacaoh_headers_c | 14 - .../patches/patch-src_threads_posix_thread-posix_h | 14 - package/cairo/Makefile | 1 - package/ccid/Makefile | 1 - package/classpath/Makefile | 37 - package/collectd/Makefile | 1 - package/cryptsetup/Makefile | 1 - package/curl/Makefile | 1 - package/cxxtools/Makefile | 1 - package/db/Makefile | 1 - package/dbus-glib/Makefile | 1 - package/dbus/Makefile | 1 - package/dillo/patches/patch-configure | 14 +- package/e2fsprogs/Makefile | 2 - package/elinks/Makefile | 1 - package/faad2/Makefile | 1 - package/ffmpeg/Makefile | 2 - package/firefox/Makefile | 15 +- package/firefox/patches/patch-configure | 66 +- .../patch-content_base_src_nsContentSink_cpp | 10 + .../patches/patch-content_media_nsAudioStream_cpp | 11 + package/firefox/patches/patch-gfx_qcms_iccread_c | 18 + package/firefox/patches/patch-gfx_qcms_qcmstypes_h | 26 + ...patch-ipc_chromium_src_base_debug_util_posix_cc | 29 + package/firefox/patches/patch-js_src_jsnum_h | 6 +- .../patches/patch-security_coreconf_Linux_mk | 4 +- .../patches/patch-security_coreconf_command_mk | 4 +- .../patches/patch-security_nss_lib_freebl_stubs_c | 11 + package/fontconfig/Makefile | 1 - package/freeradius-client/Makefile | 1 - package/gcc/Makefile | 3 +- package/gconf/Makefile | 29 - package/gdb/Makefile | 1 - package/gdk-pixbuf/Makefile | 8 +- package/glib/Makefile | 2 +- package/glib/patches/patch-gmodule-2_0_pc_in | 10 - .../glib/patches/patch-gmodule-export-2_0_pc_in | 10 - package/gnutls/Makefile | 1 - package/gpsd/Makefile | 1 - package/gtk+/Makefile | 8 +- package/gtk+/patches/patch-Makefile_in | 14 +- package/gtk+/patches/patch-ltmain_sh | 14 +- package/heimdal/Makefile | 1 - package/imlib2/Makefile | 6 +- package/iperf/Makefile | 3 - package/ipsec-tools/Makefile | 7 +- package/ipsec-tools/patches/patch-configure | 34 +- package/ipsec-tools/patches/patch-ltmain_sh | 6 +- .../patches/patch-src_racoon_algorithm_c | 5 +- .../ipsec-tools/patches/patch-src_racoon_cftoken_c | 2026 ++++++++++++++++++++ .../ipsec-tools/patches/patch-src_racoon_cftoken_l | 11 + .../patches/patch-src_racoon_crypto_openssl_c | 13 +- .../ipsec-tools/patches/patch-src_racoon_eaytest_c | 7 +- .../patches/patch-src_racoon_isakmp_xauth_c | 7 +- .../ipsec-tools/patches/patch-src_racoon_pfkey_c | 7 +- .../ipsec-tools/patches/patch-src_racoon_privsep_c | 25 +- .../patches/patch-src_racoon_racoonctl_c | 7 +- .../ipsec-tools/patches/patch-src_setkey_token_c | 707 +++++++ .../ipsec-tools/patches/patch-src_setkey_token_l | 11 + package/iptraf/Makefile | 2 - package/lame/Makefile | 10 +- package/libICE/Makefile | 2 - package/libXft/Makefile | 1 - package/libXt/Makefile | 1 - package/libdnet/Makefile | 1 - package/libevent/Makefile | 2 - package/libgcj/Makefile | 27 - package/libiconv/Makefile | 1 - package/libnet/Makefile | 1 - package/libpng/Makefile | 15 +- package/libpng/patches/001-apng.patch | 895 +++++---- package/libpng/patches/patch-ltmain_sh | 14 +- package/libpthread/Makefile | 2 +- package/libtiff/Makefile | 1 - .../libtool/patches/patch-libltdl_config_ltmain_sh | 31 + package/libupnp/Makefile | 1 - package/libxcb/Makefile | 1 - package/libxml2/Makefile | 1 - package/mpfr/Makefile | 2 - package/ncurses/Makefile | 2 +- package/nss/Makefile | 4 - package/opencdk/Makefile | 1 - package/openjdk/Makefile | 86 - .../patches/patch-icedtea6-1_10_Makefile_in | 29 - .../openjdk/patches/patch-icedtea6-1_10_configure | 479 ----- package/openjdk/patches/patch-openjdk-6_Makefile | 13 - package/openldap/Makefile | 4 +- package/openldap/patches/patch-build_ltmain_sh | 6 +- package/orbit2/Makefile | 45 - package/orbit2/patches/patch-ORBit-2_0_pc_in | 11 - package/orbit2/patches/patch-configure | 11 - .../patches/patch-src_idl-compiler_Makefile_in | 54 - package/pango/Makefile | 2 - package/pixman/Makefile | 4 +- package/qemu/Makefile | 1 - package/section.lst | 1 - package/speex/Makefile | 1 - package/sqlite/Makefile | 3 +- package/uclibc/Makefile | 6 +- package/xcb-proto/Makefile | 2 +- scripts/reloc.sh | 6 +- scripts/scan-pkgs.sh | 8 - scripts/scan-tools.sh | 4 +- scripts/sha256sum | 11 - toolchain/Config.in | 1 - toolchain/gcc/Makefile | 1 - toolchain/gcc/Makefile.inc | 4 +- toolchain/gcc/patches/cflags.patch | 179 +- toolchain/glibc-ports/Makefile.inc | 6 +- toolchain/glibc/Makefile | 10 +- toolchain/glibc/Makefile.inc | 6 +- toolchain/glibc/patches/ip_h-bug.patch | 12 + toolchain/glibc/patches/make-mixed.patch | 15 + 125 files changed, 3675 insertions(+), 1730 deletions(-) delete mode 100644 package/cacaovm/Makefile delete mode 100644 package/cacaovm/patches/patch-src_cacaoh_headers_c delete mode 100644 package/cacaovm/patches/patch-src_threads_posix_thread-posix_h delete mode 100644 package/classpath/Makefile create mode 100644 package/firefox/patches/patch-content_base_src_nsContentSink_cpp create mode 100644 package/firefox/patches/patch-content_media_nsAudioStream_cpp create mode 100644 package/firefox/patches/patch-gfx_qcms_iccread_c create mode 100644 package/firefox/patches/patch-gfx_qcms_qcmstypes_h create mode 100644 package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc create mode 100644 package/firefox/patches/patch-security_nss_lib_freebl_stubs_c delete mode 100644 package/gconf/Makefile delete mode 100644 package/glib/patches/patch-gmodule-2_0_pc_in delete mode 100644 package/glib/patches/patch-gmodule-export-2_0_pc_in create mode 100644 package/ipsec-tools/patches/patch-src_racoon_cftoken_c create mode 100644 package/ipsec-tools/patches/patch-src_racoon_cftoken_l create mode 100644 package/ipsec-tools/patches/patch-src_setkey_token_c create mode 100644 package/ipsec-tools/patches/patch-src_setkey_token_l delete mode 100644 package/libgcj/Makefile create mode 100644 package/libtool/patches/patch-libltdl_config_ltmain_sh delete mode 100644 package/openjdk/Makefile delete mode 100644 package/openjdk/patches/patch-icedtea6-1_10_Makefile_in delete mode 100644 package/openjdk/patches/patch-icedtea6-1_10_configure delete mode 100644 package/openjdk/patches/patch-openjdk-6_Makefile delete mode 100644 package/orbit2/Makefile delete mode 100644 package/orbit2/patches/patch-ORBit-2_0_pc_in delete mode 100644 package/orbit2/patches/patch-configure delete mode 100644 package/orbit2/patches/patch-src_idl-compiler_Makefile_in delete mode 100755 scripts/sha256sum create mode 100644 toolchain/glibc/patches/ip_h-bug.patch create mode 100644 toolchain/glibc/patches/make-mixed.patch diff --git a/TODO b/TODO index 6850df315..e0163c47e 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,17 @@ -- enable and test gcj -- port cacao -- port LXDE -- port openjdk +- rpath cleanup +- mark c++ packages - add and test brcm 2.6 wireless support - man pages in ipkg/tgz packages (automatic) - automate /etc handling via conffiles - distcc evaluation +- LTO GCC evaluation - fix qemu package - openssl ocf support check - new package minidlna +- wget/curl/ftp download support +- busybox update and SuSv3 removal +- check rtc support on foxg20 +- adkinstall with NTP and hwclock support - PKG_CONFLICTS for python/python2, is this possible with Kconfig? - mirror only option, for no internet access - help text for config/ needs adoption diff --git a/mk/build.mk b/mk/build.mk index e4b5866bc..02348c838 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -248,7 +248,7 @@ distclean: ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -477,7 +477,7 @@ distclean: ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR) @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG diff --git a/package/.template/Makefile b/package/.template/Makefile index 12e618f34..b9b1c125e 100644 --- a/package/.template/Makefile +++ b/package/.template/Makefile @@ -41,7 +41,7 @@ PKG_SITES:= add download url without package name #PKGFB_WITH_SSL:= openssl # define your choices for your package here, f.e. different SSL implementations -#PKG_CHOICES_PKGNAME:= WITH_OPENSSL WITH_GNUTLS +#PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS # package description for each choice #PKGCD_WITH_OPENSSL:= SSL support via OpenSSL library #PKGCD_WITH_GNUTLS:= SSL support via GNUTLS library @@ -57,7 +57,7 @@ PKG_SITES:= add download url without package name include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) #CONFIG_STYLE:= manual # use following to add ./configure options @@ -68,7 +68,7 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE #INSTALL_STYLE:= manual # please install all files and directories to the package dir -@PKG@-install: +post-install: $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \ $(IDIR_@UPKG@)/usr/bin diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 3ff05701d..fce893764 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -36,7 +36,6 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --with-magick-plus-plus=no \ --without-gslib \ --without-dps \ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 479ad854d..3ad50203f 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -35,8 +35,6 @@ $(eval $(call PKG_template,MESALIB_DEV,mesalib-dev,$(PKG_VERSION)-${PKG_RELEASE} $(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO})) $(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) DRI_DRIVERS:=i915 endif diff --git a/package/apr/Makefile b/package/apr/Makefile index 4d5f90ba2..9d93e72ed 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -25,8 +25,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,APR_DEV,apr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_APR_DEV},${PKGSC_APR_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes CONFIGURE_ENV+= ac_cv_sizeof_size_t=4 diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile index dbc662e94..c499b6127 100644 --- a/package/autoconf/Makefile +++ b/package/autoconf/Makefile @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) XAKE_FLAGS+= PERL="/usr/bin/perl" \ - M4="m4" + M4="/usr/bin/m4" autoconf-install: ${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile index 5e1e71e50..333434a37 100644 --- a/package/beecrypt/Makefile +++ b/package/beecrypt/Makefile @@ -15,14 +15,13 @@ PKG_NEED_CXX:= 1 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,BEECRYPT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --without-cplusplus \ --without-python \ --without-java -beecrypt-install: +post-install: $(INSTALL_DIR) $(IDIR_BEECRYPT)/usr/lib $(CP) $(WRKINST)/usr/lib/libbeecrypt*.so* \ $(IDIR_BEECRYPT)/usr/lib diff --git a/package/bind/Makefile b/package/bind/Makefile index 920aba93a..dd994b87e 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -51,7 +51,6 @@ $(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_DIG},${PKGSD_BIND_DIG},${PKGSC_BIND_DIG})) $(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \ --disable-threads \ --with-openssl=${STAGING_TARGET_DIR}/usr \ diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 96c6a4f67..7bbe48e0d 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -19,7 +19,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-werror \ --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 509520b0c..aae196ad6 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -21,7 +21,6 @@ $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN ifeq ($(ADK_STATIC),y) XAKE_FLAGS+= CCLD="$(TARGET_CC) -all-static -pthread" endif -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= ac_cv_prog_cc_pie=no CONFIGURE_ARGS+= --enable-tools \ --enable-alsa \ diff --git a/package/cacaovm/Makefile b/package/cacaovm/Makefile deleted file mode 100644 index 1d85a420a..000000000 --- a/package/cacaovm/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= cacaovm -PKG_VERSION:= 0.99.4 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa -PKG_DESCR:= Java VM -PKG_SECTION:= lang -PKG_BUILDDEP:= classpath zlib -PKG_DEPENDS:= classpath zlib -PKG_URL:= http://www.cacaovm.org/ -PKG_SITES:= http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/ - -WRKDIST= ${WRKDIR}/cacao-${PKG_VERSION} -DISTFILES:= cacao-${PKG_VERSION}.tar.bz2 - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,CACAOVM,cacaovm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ARGS+= --with-jni_md_h=${STAGING_TARGET_DIR}/usr/include \ - --with-java-runtime-library-prefix=${STAGING_TARGET_DIR}/usr \ - --with-cacaoh=${STAGING_TARGET_DIR}/bin/cacaoh - -post-patch: - (cd ${WRKBUILD}; ./configure \ - --enable-jit \ - --with-java-runtime-library-prefix=/opt/local \ - --enable-gc=none \ - ); - $(MAKE) -C ${WRKBUILD}/src/vmcore - $(MAKE) -C ${WRKBUILD}/src/toolbox - $(MAKE) -C ${WRKBUILD}/src/cacaoh - $(CP) $(WRKBUILD)/src/cacaoh/cacaoh $(STAGING_TARGET_DIR)/bin - $(MAKE) -C ${WRKBUILD} clean - -cacaovm-install: - $(INSTALL_DIR) $(IDIR_CACAOVM)/usr/lib - $(CP) $(WRKINST)/usr/lib/libjvm.so $(IDIR_CACAOVM)/usr/lib - $(INSTALL_DIR) $(IDIR_CACAOVM)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/cacao $(IDIR_CACAOVM)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/java $(IDIR_CACAOVM)/usr/bin - $(INSTALL_DIR) $(IDIR_CACAOVM)/usr/share/cacao - $(CP) $(WRKINST)/usr/share/cacao/vm.zip \ - $(IDIR_CACAOVM)/usr/share/cacao - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cacaovm/patches/patch-src_cacaoh_headers_c b/package/cacaovm/patches/patch-src_cacaoh_headers_c deleted file mode 100644 index 0e1ca0923..000000000 --- a/package/cacaovm/patches/patch-src_cacaoh_headers_c +++ /dev/null @@ -1,14 +0,0 @@ ---- cacao-0.99.4.orig/src/cacaoh/headers.c 2008-08-04 18:51:28.000000000 +0200 -+++ cacao-0.99.4/src/cacaoh/headers.c 2011-03-26 20:11:11.000000000 +0100 -@@ -35,8 +35,10 @@ - #if defined(ENABLE_THREADS) - # if defined(__DARWIN__) - # include -+# include -+# else -+# include - # endif --# include - #endif - - #include "mm/gc-common.h" diff --git a/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h b/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h deleted file mode 100644 index fc43526fb..000000000 --- a/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h +++ /dev/null @@ -1,14 +0,0 @@ ---- cacao-0.99.4.orig/src/threads/posix/thread-posix.h 2008-08-04 18:51:28.000000000 +0200 -+++ cacao-0.99.4/src/threads/posix/thread-posix.h 2011-03-26 20:12:13.000000000 +0100 -@@ -34,7 +34,11 @@ typedef struct threadobject threadobject - #include "config.h" - - #include -+#if defined(__DARWIN__) -+#include -+#else - #include -+#endif - - #include "vm/types.h" - diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 39667bdd9..a3d957acd 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -27,7 +27,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --enable-ft=yes \ --enable-xlib=yes diff --git a/package/ccid/Makefile b/package/ccid/Makefile index 1dfa252c0..185401e79 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -19,7 +19,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --enable-twinserial post-install: diff --git a/package/classpath/Makefile b/package/classpath/Makefile deleted file mode 100644 index 3292232c1..000000000 --- a/package/classpath/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= classpath -PKG_VERSION:= 0.98 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 90c6571b8b0309e372faa0f9f6255ea9 -PKG_DESCR:= GNU Classpath -PKG_SECTION:= lang -PKG_BUILDDEP:= gtk+ gdk-pixbuf orbit2 gconf -PKG_DEPENDS:= libgtk gdk-pixbuf orbit2 gconf -PKG_URL:= http://www.gnu.org/software/classpath/home.html -PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ARGS+= --disable-plugin \ - --disable-tools \ - --disable-examples - -classpath-install: - $(INSTALL_DIR) $(IDIR_CLASSPATH)/usr/share/classpath - $(CP) $(WRKINST)/usr/share/classpath/glibj.zip \ - $(IDIR_CLASSPATH)/usr/share/classpath - $(INSTALL_DIR) $(IDIR_CLASSPATH)/usr/lib/classpath - $(CP) $(WRKINST)/usr/lib/classpath/lib*so.* \ - $(IDIR_CLASSPATH)/usr/lib/classpath - # install to staging directory - $(INSTALL_DIR) $(STAGING_DIR)/usr/share/classpath - $(CP) $(WRKINST)/usr/share/classpath/glibj.zip \ - $(STAGING_DIR)/usr/share/classpath - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 211955af9..277e061cf 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -100,7 +100,6 @@ CONFIGURE_ARGS+= --disable-apache \ --without-libiptc \ --with-nan-emulation -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) XAKE_FLAGS+= LIBS='-lm' post-install: diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 491814c63..8ab2f397d 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-selinux \ --disable-static diff --git a/package/curl/Makefile b/package/curl/Makefile index d189d8704..f360a1e6b 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -30,7 +30,6 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ --enable-cookies \ diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 916bf8c94..812d17ea2 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) TARGET_CXXFLAGS+= -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E diff --git a/package/db/Makefile b/package/db/Makefile index ce03351b0..4b6a64643 100644 --- a/package/db/Makefile +++ b/package/db/Makefile @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBDB_DEV,libdb-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDB_DEV},${PKGSC_LIBDB_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_PROG:= dist/configure CONFIGURE_ARGS+= --enable-smallbuild \ --disable-debug_rop \ diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile index f998edca1..3ab81d067 100644 --- a/package/dbus-glib/Makefile +++ b/package/dbus-glib/Makefile @@ -23,7 +23,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DBUS_GLIB_DEV,dbus-glib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_GLIB_DEV},${PKGSC_DBUS_GLIB_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-checks CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 257a8cf12..fb4f05b67 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -27,7 +27,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-tests \ --disable-abstract-sockets \ --without-x \ diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure index 222be7882..233acb5a8 100644 --- a/package/dillo/patches/patch-configure +++ b/package/dillo/patches/patch-configure @@ -1,5 +1,5 @@ --- dillo-2.2.orig/configure 2010-02-11 11:19:59.000000000 +0100 -+++ dillo-2.2/configure 2011-03-28 02:30:04.373370428 +0200 ++++ dillo-2.2/configure 2011-01-07 21:35:04.000000000 +0100 @@ -5830,11 +5830,6 @@ typedef unsigned char bool_t; _______EOF @@ -12,15 +12,3 @@ for ac_func in gethostbyname do : ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -@@ -6215,9 +6210,9 @@ if test "x$enable_png" = "xyes"; then - $as_echo_n "checking for libpng-config... " >&6; } - - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng12-config` -+ PNG_CONFIG=`which libpng-config` - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng-config` -+ PNG_CONFIG=`which libpng15-config` - fi - if test -z "$PNG_CONFIG"; then - PNG_CONFIG=`which libpng10-config` diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 0b8a69eea..74c40a61a 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -58,11 +58,9 @@ MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \ BUILD_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" post-build: -ifeq ($(ADK_PACKAGE_E2FSCK_STATIC),y) ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static ${INSTALL_DIR} ${WRKINST}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin -endif e2fsprogs-install: ${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc diff --git a/package/elinks/Makefile b/package/elinks/Makefile index f3709cd27..ee0e2798a 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -23,7 +23,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) INSTALL_STYLE:= manual -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= -fPIC CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes diff --git a/package/faad2/Makefile b/package/faad2/Makefile index 9d2be1fe8..dab8ab734 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -18,7 +18,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) # check for lrintf fails on Darwin, don't know why CONFIGURE_ENV+= ac_cv_c99_lrintf=yes CONFIGURE_ARGS+= --without-mpeg4ip \ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index be732ea31..9c7099d77 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -27,8 +27,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) CONFIGURE_CPU_OPTS:= --enable-mmx else diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 67baa2d20..2053a117a 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 4.0 +PKG_VERSION:= 3.6.15 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3468a2c463b4fc2788ba621e4b511c30 +PKG_MD5SUM:= fcf8042948d91f1f3d9c33599b79cf35 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps -PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify libpng +PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 -PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk libpng +PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ PKG_NOPARALLEL:= 1 @@ -23,7 +23,7 @@ PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el native PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 -WRKDIST= ${WRKDIR}/mozilla-2.0 +WRKDIST= ${WRKDIR}/mozilla-1.9.2 include $(TOPDIR)/mk/package.mk @@ -47,16 +47,11 @@ CONFIGURE_ENV+= CROSS_COMPILE=1 \ HOST_RANLIB="ranlib" HOST_AR="ar" \ CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ ac_cv_sqlite_secure_delete=yes \ - ac_cv_sqlite_threadsafe=yes \ - ac_cv_sqlite_enable_fts3=yes \ - ac_cv_sqlite_enable_unlock_notify=yes \ ac_cv_thread_keyword=no \ ac_cv_sizeof_int_p=4 CONFIGURE_ARGS+= --enable-application=browser \ --enable-official-branding \ --with-system-zlib \ - --with-system-cairo \ - --with-system-pixman \ --with-system-jpeg \ --with-system-png \ --with-system-nss \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 42b39365b..6ab49e7f0 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,36 +1,52 @@ ---- mozilla-2.0.orig/configure 2011-03-19 00:48:56.000000000 +0100 -+++ mozilla-2.0/configure 2011-03-28 12:25:19.041814743 +0200 -@@ -22573,15 +22573,6 @@ if test "${with_libIDL+set}" = set; then +--- mozilla-1.9.2.orig/configure 2010-12-03 16:57:11.000000000 +0100 ++++ mozilla-1.9.2/configure 2010-12-29 21:52:34.000000000 +0100 +@@ -3970,7 +3970,7 @@ else + echo "$ac_t""yes" 1>&6 fi +- for ac_prog in $PYTHON python2.5 python2.4 python ++ for ac_prog in $PYTHON python2.6 python2.5 python2.4 python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino + CYGWIN_WRAPPER= + WIN_TOP_SRC= + MOZ_USER_DIR=".mozilla" +-HOST_AR='$(AR)' + HOST_AR_FLAGS='$(AR_FLAGS)' --if test -z "$CROSS_COMPILE"; then -- if test -z "$HOST_LIBIDL_CONFIG"; then + MOZ_JPEG_CFLAGS= +@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI + else + + if test "$cross_compiling" = yes; then +- ac_cv_sqlite_secure_delete=no ++ ac_cv_sqlite_secure_delete=yes + + else + cat > conftest.$ac_ext <(mAudioHandle), + positionType, &position) == SA_SUCCESS) { + return (position / float(mRate) / mChannels / sizeof(short)); diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c new file mode 100644 index 000000000..ea9ab6234 --- /dev/null +++ b/package/firefox/patches/patch-gfx_qcms_iccread_c @@ -0,0 +1,18 @@ +--- mozilla-1.9.2.orig/gfx/qcms/iccread.c 2010-04-02 18:02:27.000000000 +0200 ++++ mozilla-1.9.2/gfx/qcms/iccread.c 2010-04-30 14:00:52.430967966 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "qcmsint.h" + + //XXX: use a better typename +@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile * + qcms_profile_fini(profile); + } + +-#include + qcms_profile* qcms_profile_from_file(FILE *file) + { + uint32_t length, remaining_length; diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h new file mode 100644 index 000000000..80f68661a --- /dev/null +++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h @@ -0,0 +1,26 @@ +--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200 ++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-30 17:58:33.490975825 +0200 +@@ -11,22 +11,12 @@ + /* int_types.h gets included somehow, so avoid redefining the types differently */ + #include + #else +-typedef PRInt8 int8_t; +-typedef PRUint8 uint8_t; +-typedef PRInt16 int16_t; +-typedef PRUint16 uint16_t; +-typedef PRInt32 int32_t; +-typedef PRUint32 uint32_t; +-typedef PRInt64 int64_t; +-typedef PRUint64 uint64_t; +- ++#include + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include + #elif defined(__FreeBSD__) + /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */ +-#else +-typedef PRUptrdiff uintptr_t; + #endif + #endif + diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc new file mode 100644 index 000000000..833e94185 --- /dev/null +++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc @@ -0,0 +1,29 @@ +--- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc 2010-10-27 05:01:17.000000000 +0200 ++++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc 2010-11-12 11:53:10.614327269 +0100 +@@ -114,6 +114,9 @@ void DebugUtil::BreakDebugger() { + } + + StackTrace::StackTrace() { ++#ifdef CHROMIUM_MOZILLA_BUILD ++ return; ++#else + const int kMaxCallers = 256; + + void* callers[kMaxCallers]; +@@ -128,11 +131,16 @@ StackTrace::StackTrace() { + } else { + trace_.resize(0); + } ++#endif + } + + void StackTrace::PrintBacktrace() { ++#ifdef CHROMIUM_MOZILLA_BUILD ++ return; ++#else + fflush(stderr); + backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); ++#endif + } + + void StackTrace::OutputToStream(std::ostream* os) { diff --git a/package/firefox/patches/patch-js_src_jsnum_h b/package/firefox/patches/patch-js_src_jsnum_h index 54c7064cf..af999878c 100644 --- a/package/firefox/patches/patch-js_src_jsnum_h +++ b/package/firefox/patches/patch-js_src_jsnum_h @@ -1,6 +1,6 @@ ---- mozilla-2.0.orig/js/src/jsnum.h 2011-03-19 00:33:50.000000000 +0100 -+++ mozilla-2.0/js/src/jsnum.h 2011-03-27 20:18:21.253370504 +0200 -@@ -101,7 +101,7 @@ JSDOUBLE_IS_FINITE(jsdouble d) +--- mozilla-1.9.2.orig/js/src/jsnum.h 2010-04-02 18:02:28.000000000 +0200 ++++ mozilla-1.9.2/js/src/jsnum.h 2010-04-11 14:04:14.000000000 +0200 +@@ -98,7 +98,7 @@ JSDOUBLE_IS_FINITE(jsdouble d) #ifdef WIN32 return _finite(d); #else diff --git a/package/firefox/patches/patch-security_coreconf_Linux_mk b/package/firefox/patches/patch-security_coreconf_Linux_mk index 32aaf4633..26a3dc8f3 100644 --- a/package/firefox/patches/patch-security_coreconf_Linux_mk +++ b/package/firefox/patches/patch-security_coreconf_Linux_mk @@ -1,5 +1,5 @@ ---- mozilla-2.0.orig/security/coreconf/Linux.mk 2011-03-19 00:34:04.000000000 +0100 -+++ mozilla-2.0/security/coreconf/Linux.mk 2011-03-28 13:44:58.221818344 +0200 +--- mozilla-1.9.2.orig/security/coreconf/Linux.mk 2010-12-03 16:48:49.000000000 +0100 ++++ mozilla-1.9.2/security/coreconf/Linux.mk 2011-01-20 20:18:26.904905227 +0100 @@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1) IMPL_STRATEGY = _PTH endif diff --git a/package/firefox/patches/patch-security_coreconf_command_mk b/package/firefox/patches/patch-security_coreconf_command_mk index 3b4ddc1be..fcf73b8a8 100644 --- a/package/firefox/patches/patch-security_coreconf_command_mk +++ b/package/firefox/patches/patch-security_coreconf_command_mk @@ -1,5 +1,5 @@ ---- mozilla-2.0.orig/security/coreconf/command.mk 2011-03-19 00:34:04.000000000 +0100 -+++ mozilla-2.0/security/coreconf/command.mk 2011-03-28 13:45:21.461818772 +0200 +--- mozilla-1.9.2.orig/security/coreconf/command.mk 2010-12-03 16:48:49.000000000 +0100 ++++ mozilla-1.9.2/security/coreconf/command.mk 2011-01-20 20:18:56.214904993 +0100 @@ -48,7 +48,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ $(XCFLAGS) diff --git a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c new file mode 100644 index 000000000..233823c91 --- /dev/null +++ b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c @@ -0,0 +1,11 @@ +--- mozilla-1.9.2.orig/security/nss/lib/freebl/stubs.c 2010-04-02 18:03:06.000000000 +0200 ++++ mozilla-1.9.2/security/nss/lib/freebl/stubs.c 2010-04-11 15:37:04.000000000 +0200 +@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib) + * fetch the library if it's loaded. For NSS it should already be loaded + */ + #define freebl_getLibrary(libName) \ +- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) ++ dlopen (libName, RTLD_LAZY) + + #define freebl_releaseLibrary(lib) \ + if (lib) dlclose(lib) diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 449703864..691d12369 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -27,7 +27,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,FONTCONFIG_DEV,fontconfig-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONTCONFIG_DEV},${PKGSC_FONTCONFIG_DEV},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_LDFLAGS+= -liconv CONFIGURE_ARGS+= --with-arch=${ARCH} \ --disable-docs diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile index 6a38be64f..eecc9f3ee 100644 --- a/package/freeradius-client/Makefile +++ b/package/freeradius-client/Makefile @@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= ac_cv_func_uname=no post-install: diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 3f50b9e91..fec6661e3 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -16,9 +16,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CPPFLAGS:= '' TARGET_CFLAGS:= '' -TARGET_CXXFLAGS:= $(filter-out -fstack-protector,$(TARGET_CXXFLAGS)) +TARGET_CPPFLAGS:= '' ifeq ($(ADK_LINUX_64),y) CONFIGURE_ARGS+= --with-abi=64 diff --git a/package/gconf/Makefile b/package/gconf/Makefile deleted file mode 100644 index dd47682c2..000000000 --- a/package/gconf/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= GConf -PKG_VERSION:= 2.32.1 -PKG_EXTRAVER:= 2.32 -PKG_RELEASE:= 1 -PKG_MD5SUM:= de83e70453910ac62f9ee2a86444bdab -PKG_DESCR:= a system for storing application preferences -PKG_SECTION:= libs -PKG_BUILDDEP:= dbus dbus-glib -PKG_DEPENDS:= dbus dbus-glib -PKG_URL:= http://projects.gnome.org/gconf/ -PKG_SITES:= ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/ - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,GCONF,gconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -gconf-install: - $(INSTALL_DIR) $(IDIR_GCONF)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/* $(IDIR_GCONF)/usr/bin - $(INSTALL_DIR) $(IDIR_GCONF)/usr/lib - $(INSTALL_BIN) $(WRKINST)/usr/lib/libgconf*.so* \ - $(IDIR_GCONF)/usr/lib - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index c29c48e65..d14a71761 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -16,7 +16,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= ${TARGET_CPPFLAGS} -fPIC CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \ --disable-tui --disable-gdbtk --without-x \ diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index 5b747b23c..da0d89f94 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= gdk-pixbuf -PKG_VERSION:= 2.23.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 74818d3ac4d7ebaf6bf24883c171a885 +PKG_VERSION:= 2.23.0 +PKG_RELEASE:= 2 +PKG_MD5SUM:= a7d6c5f2fe2d481149ed3ba807b5c043 PKG_DESCR:= GDK pixbuf library -PKG_SECTION:= libs PKG_BUILDDEP:= jpeg libtiff +PKG_SECTION:= libs PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/ PKG_NEED_CXX:= 1 diff --git a/package/glib/Makefile b/package/glib/Makefile index 4bd99944c..e3d0625df 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -11,7 +11,7 @@ PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libintl libiconv libpthread -PKG_BUILDDEP:= gettext libiconv dbus +PKG_BUILDDEP:= gettext libiconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ diff --git a/package/glib/patches/patch-gmodule-2_0_pc_in b/package/glib/patches/patch-gmodule-2_0_pc_in deleted file mode 100644 index db8446fed..000000000 --- a/package/glib/patches/patch-gmodule-2_0_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.28.1.orig/gmodule-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200 -+++ glib-2.28.1/gmodule-2.0.pc.in 2011-03-25 19:49:39.000000000 +0100 -@@ -9,6 +9,6 @@ Name: GModule - Description: Dynamic module loader for GLib - Requires: glib-2.0 - Version: @VERSION@ --Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@ -+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@ - Libs.private: @G_MODULE_LIBS@ - Cflags: @G_THREAD_CFLAGS@ diff --git a/package/glib/patches/patch-gmodule-export-2_0_pc_in b/package/glib/patches/patch-gmodule-export-2_0_pc_in deleted file mode 100644 index bf61551fd..000000000 --- a/package/glib/patches/patch-gmodule-export-2_0_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.28.1.orig/gmodule-export-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200 -+++ glib-2.28.1/gmodule-export-2.0.pc.in 2011-03-25 19:49:59.000000000 +0100 -@@ -9,6 +9,6 @@ Name: GModule - Description: Dynamic module loader for GLib - Requires: glib-2.0 - Version: @VERSION@ --Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@ -+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@ - Libs.private: @G_MODULE_LIBS@ - Cflags: @G_THREAD_CFLAGS@ diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index bd4fc9f81..2257a1596 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -31,7 +31,6 @@ $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEAS $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA})) $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ --with-libgcrypt-prefix=${STAGING_TARGET_DIR}/usr \ diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 397460f67..49660d151 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -25,7 +25,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GPSD_CLIENTS},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= EGREP="grep -E" \ CPP="$(TARGET_CC) -E" \ ac_cv_func_strlcpy=no \ diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index e1c0eb5de..47fad3fa0 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.24.3 -PKG_EXTRAVER:= 2.24 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 2c9f2dc5768480bedf26c6dfc3f7c254 +PKG_VERSION:= 2.18.6 +PKG_EXTRAVER:= 2.18 +PKG_RELEASE:= 2 +PKG_MD5SUM:= f98617af9f6be3065f64248f78dae2b7 PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in index 01b7c66da..5f732adc4 100644 --- a/package/gtk+/patches/patch-Makefile_in +++ b/package/gtk+/patches/patch-Makefile_in @@ -1,13 +1,13 @@ ---- gtk+-2.24.3.orig/Makefile.in 2011-03-14 18:10:47.000000000 +0100 -+++ gtk+-2.24.3/Makefile.in 2011-03-18 00:48:15.433370501 +0100 -@@ -457,8 +457,8 @@ XVFB_START = \ +--- gtk+-2.18.6.orig/Makefile.in 2010-01-11 22:11:32.000000000 +0100 ++++ gtk+-2.18.6/Makefile.in 2011-01-19 15:27:36.616158611 +0100 +@@ -467,8 +467,8 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY --SRC_SUBDIRS = gdk gtk modules demos tests perf --SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build -+SRC_SUBDIRS = gdk gtk modules perf -+SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules ++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros # require automake 1.4 AUTOMAKE_OPTIONS = 1.7 diff --git a/package/gtk+/patches/patch-ltmain_sh b/package/gtk+/patches/patch-ltmain_sh index 8104e4837..77ed2f207 100644 --- a/package/gtk+/patches/patch-ltmain_sh +++ b/package/gtk+/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- gtk+-2.24.3.orig/ltmain.sh 2011-02-08 13:25:07.000000000 +0100 -+++ gtk+-2.24.3/ltmain.sh 2011-03-18 00:44:15.143369818 +0100 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization +--- gtk+-2.18.6.orig/ltmain.sh 2009-12-02 12:35:38.000000000 +0100 ++++ gtk+-2.18.6/ltmain.sh 2011-01-19 15:27:06.368658496 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 785dfeefb..68d329112 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -38,7 +38,6 @@ $(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL},${PKGSC_LIBHEIMDAL})) $(eval $(call PKG_template,LIBHEIMDAL_CLIENT,libheimdal-client,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL_CLIENT},${PKGSC_LIBHEIMDAL_CLIENT})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \ --disable-otp \ --disable-ndbm-db \ diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile index 12deefa5f..166d9cd40 100644 --- a/package/imlib2/Makefile +++ b/package/imlib2/Makefile @@ -16,11 +16,9 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,IMLIB2,imlib2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,IMLIB2,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - -imlib2-install: +post-install: $(INSTALL_DIR) $(IDIR_IMLIB2)/usr/lib/imlib2/{filters,loaders} ${CP} $(WRKINST)/usr/lib/libImlib2.so* $(IDIR_IMLIB2)/usr/lib ${CP} $(WRKINST)/usr/lib/imlib2/filters/*.so \ diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 154175fc5..b2d01f86d 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -19,9 +19,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -TARGET_CXXFLAGS:= $(filter-out -flto,$(TARGET_CXXFLAGS)) - ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) TARGET_LDFLAGS+= -lssp endif diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 54f155f89..f3ed9dfa8 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ipsec-tools -PKG_VERSION:= 0.8.0 +PKG_VERSION:= 0.7.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= b79aae3055a51f8de5c0f1b8ca6cf619 +PKG_MD5SUM:= 72861f005746ee27984b2ee715ecc629 PKG_DESCR:= IPsec management tools PKG_SECTION:= net/security -PKG_BUILDDEP:= openssl PKG_DEPENDS:= libopenssl +PKG_BUILDDEP:= openssl PKG_URL:= http://ipsec-tools.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSEC_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \ --without-readline \ --disable-security-context \ diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure index 87bfb96a4..29e65cf5b 100644 --- a/package/ipsec-tools/patches/patch-configure +++ b/package/ipsec-tools/patches/patch-configure @@ -1,6 +1,7 @@ ---- ipsec-tools-0.8.0.orig/configure 2011-03-18 14:27:41.000000000 +0100 -+++ ipsec-tools-0.8.0/configure 2011-03-31 13:16:18.091819156 +0200 -@@ -11535,7 +11535,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/configure 2009-04-21 16:41:45.000000000 +0200 ++++ ipsec-tools-0.7.2/configure 2009-05-29 15:28:06.991791782 +0200 +@@ -11963,7 +11963,7 @@ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } @@ -9,30 +10,3 @@ case $host in *netbsd*) -@@ -12286,7 +12286,7 @@ $as_echo "$as_me: WARNING: Using a gener - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if printf accepts %z" >&5 - $as_echo_n "checking if printf accepts %z... " >&6; } - saved_CFLAGS=$CFLAGS --CFLAGS="$CFLAGS -Wall -Werror" -+CFLAGS="$CFLAGS -Wall" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -13739,7 +13739,7 @@ $as_echo "#define HAVE_LIBLDAP /**/" >>c - LIBS="$LIBS -L$libldap_dir/lib -R$libldap_dir/lib -lldap" - - saved_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13852,7 +13852,7 @@ $as_echo "#define HAVE_GSSAPI /**/" >>co - - # Check if iconv 2nd argument needs const - saved_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" - ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" diff --git a/package/ipsec-tools/patches/patch-ltmain_sh b/package/ipsec-tools/patches/patch-ltmain_sh index 9771c2407..f0e98067d 100644 --- a/package/ipsec-tools/patches/patch-ltmain_sh +++ b/package/ipsec-tools/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- ipsec-tools-0.8.0.orig/ltmain.sh 2011-03-18 14:27:39.000000000 +0100 -+++ ipsec-tools-0.8.0/ltmain.sh 2011-03-31 13:16:42.511821748 +0200 -@@ -4765,7 +4765,7 @@ func_mode_link () +--- ipsec-tools-0.7.2.orig/ltmain.sh 2009-04-21 16:41:43.000000000 +0200 ++++ ipsec-tools-0.7.2/ltmain.sh 2011-01-15 21:50:23.000000000 +0100 +@@ -4238,7 +4238,7 @@ func_mode_link () # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ diff --git a/package/ipsec-tools/patches/patch-src_racoon_algorithm_c b/package/ipsec-tools/patches/patch-src_racoon_algorithm_c index 82a3d057b..351ce1771 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_algorithm_c +++ b/package/ipsec-tools/patches/patch-src_racoon_algorithm_c @@ -1,5 +1,6 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/algorithm.c 2006-10-06 14:02:27.000000000 +0200 -+++ ipsec-tools-0.8.0/src/racoon/algorithm.c 2011-03-31 13:22:28.381818558 +0200 +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/algorithm.c 2006-10-06 14:02:27.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/algorithm.c 2009-05-29 15:51:03.662094000 +0200 @@ -111,9 +111,11 @@ static struct enc_algorithm oakley_encde eay_idea_encrypt, eay_idea_decrypt, eay_idea_weakkey, eay_idea_keylen, }, diff --git a/package/ipsec-tools/patches/patch-src_racoon_cftoken_c b/package/ipsec-tools/patches/patch-src_racoon_cftoken_c new file mode 100644 index 000000000..29bdf1a77 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_cftoken_c @@ -0,0 +1,2026 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/cftoken.c 2008-07-23 13:49:19.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/cftoken.c 2009-05-29 15:50:16.982910033 +0200 +@@ -8,7 +8,7 @@ + #define FLEX_SCANNER + #define YY_FLEX_MAJOR_VERSION 2 + #define YY_FLEX_MINOR_VERSION 5 +-#define YY_FLEX_SUBMINOR_VERSION 34 ++#define YY_FLEX_SUBMINOR_VERSION 35 + #if YY_FLEX_SUBMINOR_VERSION > 0 + #define FLEX_BETA + #endif +@@ -178,13 +178,6 @@ extern FILE *yyin, *yyout; + + #define unput(c) yyunput( c, (yytext_ptr) ) + +-/* The following is because we cannot portably get our hands on size_t +- * (without autoconf's help, which isn't available because we want +- * flex-generated scanners to compile on their own). +- * Given that the standard has decreed that size_t exists since 1989, +- * I guess we can afford to depend on it. Manoj. +- */ +- + #ifndef YY_TYPEDEF_YY_SIZE_T + #define YY_TYPEDEF_YY_SIZE_T + typedef size_t yy_size_t; +@@ -1634,6 +1627,7 @@ static struct include_stack { + static int incstackp = 0; + + static int yy_first_time = 1; ++int yywrap(void) { return 1; } + /* common seciton */ + /*octet (([01]?{digit}?{digit})|((2([0-4]{digit}))|(25[0-5]))) */ + +@@ -1642,7 +1636,7 @@ static int yy_first_time = 1; + + + +-#line 1646 "cftoken.c" ++#line 1640 "cftoken.c" + + #define INITIAL 0 + #define S_INI 1 +@@ -1679,6 +1673,35 @@ static int yy_first_time = 1; + + static int yy_init_globals (void ); + ++/* Accessor methods to globals. ++ These are made visible to non-reentrant scanners for convenience. */ ++ ++int yylex_destroy (void ); ++ ++int yyget_debug (void ); ++ ++void yyset_debug (int debug_flag ); ++ ++YY_EXTRA_TYPE yyget_extra (void ); ++ ++void yyset_extra (YY_EXTRA_TYPE user_defined ); ++ ++FILE *yyget_in (void ); ++ ++void yyset_in (FILE * in_str ); ++ ++FILE *yyget_out (void ); ++ ++void yyset_out (FILE * out_str ); ++ ++int yyget_leng (void ); ++ ++char *yyget_text (void ); ++ ++int yyget_lineno (void ); ++ ++void yyset_lineno (int line_number ); ++ + /* Macros after this point can all be overridden by user definitions in + * section 1. + */ +@@ -1814,7 +1837,7 @@ YY_DECL + register char *yy_cp, *yy_bp; + register int yy_act; + +-#line 142 "cftoken.l" ++#line 143 "cftoken.l" + + + if (yy_first_time) { +@@ -1824,7 +1847,7 @@ YY_DECL + + + /* privsep */ +-#line 1828 "cftoken.c" ++#line 1851 "cftoken.c" + + if ( !(yy_init) ) + { +@@ -1915,1028 +1938,1028 @@ do_action: /* This label is used only to + + case 1: + YY_RULE_SETUP +-#line 151 "cftoken.l" ++#line 152 "cftoken.l" + { BEGIN S_PRIV; YYDB; return(PRIVSEP); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 152 "cftoken.l" ++#line 153 "cftoken.l" + { return(BOC); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 153 "cftoken.l" ++#line 154 "cftoken.l" + { YYD; return(USER); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 154 "cftoken.l" ++#line 155 "cftoken.l" + { YYD; return(GROUP); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 155 "cftoken.l" ++#line 156 "cftoken.l" + { YYD; return(CHROOT); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 156 "cftoken.l" ++#line 157 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* path */ + case 7: + YY_RULE_SETUP +-#line 159 "cftoken.l" ++#line 160 "cftoken.l" + { BEGIN S_PTH; YYDB; return(PATH); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 160 "cftoken.l" ++#line 161 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_INCLUDE; + return(PATHTYPE); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 162 "cftoken.l" ++#line 163 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_PSK; + return(PATHTYPE); } + YY_BREAK + case 10: + YY_RULE_SETUP +-#line 164 "cftoken.l" ++#line 165 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_CERT; + return(PATHTYPE); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 166 "cftoken.l" ++#line 167 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_SCRIPT; + return(PATHTYPE); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 168 "cftoken.l" ++#line 169 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_BA