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. --- 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 +- 110 files changed, 3525 insertions(+), 1602 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 (limited to 'package') 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_BACKUPSA; + return(PATHTYPE); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 170 "cftoken.l" ++#line 171 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_PIDFILE; + return(PATHTYPE); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 172 "cftoken.l" ++#line 173 "cftoken.l" + { BEGIN S_INI; YYDB; return(EOS); } + YY_BREAK + /* include */ + case 15: + YY_RULE_SETUP +-#line 175 "cftoken.l" ++#line 176 "cftoken.l" + { YYDB; return(INCLUDE); } + YY_BREAK + /* self information */ + case 16: + YY_RULE_SETUP +-#line 178 "cftoken.l" ++#line 179 "cftoken.l" + { BEGIN S_INF; YYDB; yywarn("it is obsoleted. use \"my_identifier\" in each remote directives."); return(IDENTIFIER); } + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 179 "cftoken.l" ++#line 180 "cftoken.l" + { BEGIN S_INI; return(EOS); } + YY_BREAK + /* special */ + case 18: + YY_RULE_SETUP +-#line 182 "cftoken.l" ++#line 183 "cftoken.l" + { YYDB; return(COMPLEX_BUNDLE); } + YY_BREAK + /* logging */ + case 19: + YY_RULE_SETUP +-#line 185 "cftoken.l" ++#line 186 "cftoken.l" + { BEGIN S_LOG; YYDB; return(LOGGING); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 186 "cftoken.l" ++#line 187 "cftoken.l" + { YYD; yylval.num = LLV_ERROR; return(LOGLEV); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 187 "cftoken.l" ++#line 188 "cftoken.l" + { YYD; yylval.num = LLV_WARNING; return(LOGLEV); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 188 "cftoken.l" ++#line 189 "cftoken.l" + { YYD; yylval.num = LLV_NOTIFY; return(LOGLEV); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 189 "cftoken.l" ++#line 190 "cftoken.l" + { YYD; yylval.num = LLV_INFO; return(LOGLEV); } + YY_BREAK + case 24: + YY_RULE_SETUP +-#line 190 "cftoken.l" ++#line 191 "cftoken.l" + { YYD; yylval.num = LLV_DEBUG; return(LOGLEV); } + YY_BREAK + case 25: + YY_RULE_SETUP +-#line 191 "cftoken.l" ++#line 192 "cftoken.l" + { YYD; yylval.num = LLV_DEBUG2; return(LOGLEV); } + YY_BREAK + case 26: + YY_RULE_SETUP +-#line 192 "cftoken.l" ++#line 193 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"debug2\""); yylval.num = LLV_DEBUG2; return(LOGLEV); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 193 "cftoken.l" ++#line 194 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"debug2\""); yylval.num = LLV_DEBUG2; return(LOGLEV); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 194 "cftoken.l" ++#line 195 "cftoken.l" + { BEGIN S_INI; return(EOS); } + YY_BREAK + /* padding */ + case 29: + YY_RULE_SETUP +-#line 197 "cftoken.l" ++#line 198 "cftoken.l" + { BEGIN S_PAD; YYDB; return(PADDING); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 198 "cftoken.l" ++#line 199 "cftoken.l" + { return(BOC); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 199 "cftoken.l" ++#line 200 "cftoken.l" + { YYD; return(PAD_RANDOMIZE); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 200 "cftoken.l" ++#line 201 "cftoken.l" + { YYD; return(PAD_RANDOMIZELEN); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 201 "cftoken.l" ++#line 202 "cftoken.l" + { YYD; return(PAD_MAXLEN); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 202 "cftoken.l" ++#line 203 "cftoken.l" + { YYD; return(PAD_STRICT); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 203 "cftoken.l" ++#line 204 "cftoken.l" + { YYD; return(PAD_EXCLTAIL); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 204 "cftoken.l" ++#line 205 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* listen */ + case 37: + YY_RULE_SETUP +-#line 207 "cftoken.l" ++#line 208 "cftoken.l" + { BEGIN S_LST; YYDB; return(LISTEN); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 208 "cftoken.l" ++#line 209 "cftoken.l" + { return(BOC); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 209 "cftoken.l" ++#line 210 "cftoken.l" + { YYD; return(X_ISAKMP); } + YY_BREAK + case 40: + YY_RULE_SETUP +-#line 210 "cftoken.l" ++#line 211 "cftoken.l" + { YYD; return(X_ISAKMP_NATT); } + YY_BREAK + case 41: + YY_RULE_SETUP +-#line 211 "cftoken.l" ++#line 212 "cftoken.l" + { YYD; return(X_ADMIN); } + YY_BREAK + case 42: + YY_RULE_SETUP +-#line 212 "cftoken.l" ++#line 213 "cftoken.l" + { YYD; return(ADMINSOCK); } + YY_BREAK + case 43: + YY_RULE_SETUP +-#line 213 "cftoken.l" ++#line 214 "cftoken.l" + { YYD; return(DISABLED); } + YY_BREAK + case 44: + YY_RULE_SETUP +-#line 214 "cftoken.l" ++#line 215 "cftoken.l" + { YYD; return(STRICT_ADDRESS); } + YY_BREAK + case 45: + YY_RULE_SETUP +-#line 215 "cftoken.l" ++#line 216 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* ldap config */ + case 46: + YY_RULE_SETUP +-#line 218 "cftoken.l" ++#line 219 "cftoken.l" + { BEGIN S_LDAP; YYDB; return(LDAPCFG); } + YY_BREAK + case 47: + YY_RULE_SETUP +-#line 219 "cftoken.l" ++#line 220 "cftoken.l" + { return(BOC); } + YY_BREAK + case 48: + YY_RULE_SETUP +-#line 220 "cftoken.l" ++#line 221 "cftoken.l" + { YYD; return(LDAP_PVER); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 221 "cftoken.l" ++#line 222 "cftoken.l" + { YYD; return(LDAP_HOST); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 222 "cftoken.l" ++#line 223 "cftoken.l" + { YYD; return(LDAP_PORT); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 223 "cftoken.l" ++#line 224 "cftoken.l" + { YYD; return(LDAP_BASE); } + YY_BREAK + case 52: + YY_RULE_SETUP +-#line 224 "cftoken.l" ++#line 225 "cftoken.l" + { YYD; return(LDAP_SUBTREE); } + YY_BREAK + case 53: + YY_RULE_SETUP +-#line 225 "cftoken.l" ++#line 226 "cftoken.l" + { YYD; return(LDAP_BIND_DN); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 226 "cftoken.l" ++#line 227 "cftoken.l" + { YYD; return(LDAP_BIND_PW); } + YY_BREAK + case 55: + YY_RULE_SETUP +-#line 227 "cftoken.l" ++#line 228 "cftoken.l" + { YYD; return(LDAP_ATTR_USER); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 228 "cftoken.l" ++#line 229 "cftoken.l" + { YYD; return(LDAP_ATTR_ADDR); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 229 "cftoken.l" ++#line 230 "cftoken.l" + { YYD; return(LDAP_ATTR_MASK); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 230 "cftoken.l" ++#line 231 "cftoken.l" + { YYD; return(LDAP_ATTR_GROUP); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 231 "cftoken.l" ++#line 232 "cftoken.l" + { YYD; return(LDAP_ATTR_MEMBER); } + YY_BREAK + case 60: + YY_RULE_SETUP +-#line 232 "cftoken.l" ++#line 233 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* mode_cfg */ + case 61: + YY_RULE_SETUP +-#line 235 "cftoken.l" ++#line 236 "cftoken.l" + { BEGIN S_CFG; YYDB; return(MODECFG); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 236 "cftoken.l" ++#line 237 "cftoken.l" + { return(BOC); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 237 "cftoken.l" ++#line 238 "cftoken.l" + { YYD; return(CFG_NET4); } + YY_BREAK + case 64: + YY_RULE_SETUP +-#line 238 "cftoken.l" ++#line 239 "cftoken.l" + { YYD; return(CFG_MASK4); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 239 "cftoken.l" ++#line 240 "cftoken.l" + { YYD; return(CFG_DNS4); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 240 "cftoken.l" ++#line 241 "cftoken.l" + { YYD; return(CFG_NBNS4); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 241 "cftoken.l" ++#line 242 "cftoken.l" + { YYD; return(CFG_NBNS4); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 242 "cftoken.l" ++#line 243 "cftoken.l" + { YYD; return(CFG_DEFAULT_DOMAIN); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 243 "cftoken.l" ++#line 244 "cftoken.l" + { YYD; return(CFG_AUTH_SOURCE); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 244 "cftoken.l" ++#line 245 "cftoken.l" + { YYD; return(CFG_AUTH_GROUPS); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 245 "cftoken.l" ++#line 246 "cftoken.l" + { YYD; return(CFG_GROUP_SOURCE); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 246 "cftoken.l" ++#line 247 "cftoken.l" + { YYD; return(CFG_CONF_SOURCE); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 247 "cftoken.l" ++#line 248 "cftoken.l" + { YYD; return(CFG_ACCOUNTING); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 248 "cftoken.l" ++#line 249 "cftoken.l" + { YYD; return(CFG_SYSTEM); } + YY_BREAK + case 75: + YY_RULE_SETUP +-#line 249 "cftoken.l" ++#line 250 "cftoken.l" + { YYD; return(CFG_LOCAL); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 250 "cftoken.l" ++#line 251 "cftoken.l" + { YYD; return(CFG_NONE); } + YY_BREAK + case 77: + YY_RULE_SETUP +-#line 251 "cftoken.l" ++#line 252 "cftoken.l" + { YYD; return(CFG_RADIUS); } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 252 "cftoken.l" ++#line 253 "cftoken.l" + { YYD; return(CFG_PAM); } + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 253 "cftoken.l" ++#line 254 "cftoken.l" + { YYD; return(CFG_LDAP); } + YY_BREAK + case 80: + YY_RULE_SETUP +-#line 254 "cftoken.l" ++#line 255 "cftoken.l" + { YYD; return(CFG_POOL_SIZE); } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 255 "cftoken.l" ++#line 256 "cftoken.l" + { YYD; return(CFG_MOTD); } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 256 "cftoken.l" ++#line 257 "cftoken.l" + { YYD; return(CFG_AUTH_THROTTLE); } + YY_BREAK + case 83: + YY_RULE_SETUP +-#line 257 "cftoken.l" ++#line 258 "cftoken.l" + { YYD; return(CFG_SPLIT_NETWORK); } + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 258 "cftoken.l" ++#line 259 "cftoken.l" + { YYD; return(CFG_SPLIT_LOCAL); } + YY_BREAK + case 85: + YY_RULE_SETUP +-#line 259 "cftoken.l" ++#line 260 "cftoken.l" + { YYD; return(CFG_SPLIT_INCLUDE); } + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 260 "cftoken.l" ++#line 261 "cftoken.l" + { YYD; return(CFG_SPLIT_DNS); } + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 261 "cftoken.l" ++#line 262 "cftoken.l" + { YYD; return(CFG_PFS_GROUP); } + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 262 "cftoken.l" ++#line 263 "cftoken.l" + { YYD; return(CFG_SAVE_PASSWD); } + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 263 "cftoken.l" ++#line 264 "cftoken.l" + { YYD; return(COMMA); } + YY_BREAK + case 90: + YY_RULE_SETUP +-#line 264 "cftoken.l" ++#line 265 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* timer */ + case 91: + YY_RULE_SETUP +-#line 267 "cftoken.l" ++#line 268 "cftoken.l" + { BEGIN S_RTRY; YYDB; return(RETRY); } + YY_BREAK + case 92: + YY_RULE_SETUP +-#line 268 "cftoken.l" ++#line 269 "cftoken.l" + { return(BOC); } + YY_BREAK + case 93: + YY_RULE_SETUP +-#line 269 "cftoken.l" ++#line 270 "cftoken.l" + { YYD; return(RETRY_COUNTER); } + YY_BREAK + case 94: + YY_RULE_SETUP +-#line 270 "cftoken.l" ++#line 271 "cftoken.l" + { YYD; return(RETRY_INTERVAL); } + YY_BREAK + case 95: + YY_RULE_SETUP +-#line 271 "cftoken.l" ++#line 272 "cftoken.l" + { YYD; return(RETRY_PERSEND); } + YY_BREAK + case 96: + YY_RULE_SETUP +-#line 272 "cftoken.l" ++#line 273 "cftoken.l" + { YYD; return(RETRY_PHASE1); } + YY_BREAK + case 97: + YY_RULE_SETUP +-#line 273 "cftoken.l" ++#line 274 "cftoken.l" + { YYD; return(RETRY_PHASE2); } + YY_BREAK + case 98: + YY_RULE_SETUP +-#line 274 "cftoken.l" ++#line 275 "cftoken.l" + { YYD; return(NATT_KA); } + YY_BREAK + case 99: + YY_RULE_SETUP +-#line 275 "cftoken.l" ++#line 276 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* sainfo */ + case 100: + YY_RULE_SETUP +-#line 278 "cftoken.l" ++#line 279 "cftoken.l" + { BEGIN S_SAINF; YYDB; return(SAINFO); } + YY_BREAK + case 101: + YY_RULE_SETUP +-#line 279 "cftoken.l" ++#line 280 "cftoken.l" + { YYD; return(ANONYMOUS); } + YY_BREAK + case 102: + YY_RULE_SETUP +-#line 280 "cftoken.l" ++#line 281 "cftoken.l" + { YYD; return(PORTANY); } + YY_BREAK + case 103: + YY_RULE_SETUP +-#line 281 "cftoken.l" ++#line 282 "cftoken.l" + { YYD; return(ANY); } + YY_BREAK + case 104: + YY_RULE_SETUP +-#line 282 "cftoken.l" ++#line 283 "cftoken.l" + { YYD; return(FROM); } + YY_BREAK + case 105: + YY_RULE_SETUP +-#line 283 "cftoken.l" ++#line 284 "cftoken.l" + { YYD; return(GROUP); } + YY_BREAK + /* sainfo spec */ + case 106: + YY_RULE_SETUP +-#line 285 "cftoken.l" ++#line 286 "cftoken.l" + { BEGIN S_SAINFS; return(BOC); } + YY_BREAK + case 107: + YY_RULE_SETUP +-#line 286 "cftoken.l" ++#line 287 "cftoken.l" + { BEGIN S_INI; return(EOS); } + YY_BREAK + case 108: + YY_RULE_SETUP +-#line 287 "cftoken.l" ++#line 288 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + case 109: + YY_RULE_SETUP +-#line 288 "cftoken.l" ++#line 289 "cftoken.l" + { YYD; return(PFS_GROUP); } + YY_BREAK + case 110: + YY_RULE_SETUP +-#line 289 "cftoken.l" ++#line 290 "cftoken.l" + { YYD; return(REMOTEID); } + YY_BREAK + case 111: + YY_RULE_SETUP +-#line 290 "cftoken.l" ++#line 291 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"my_identifier\"."); return(IDENTIFIER); } + YY_BREAK + case 112: + YY_RULE_SETUP +-#line 291 "cftoken.l" ++#line 292 "cftoken.l" + { YYD; return(MY_IDENTIFIER); } + YY_BREAK + case 113: + YY_RULE_SETUP +-#line 292 "cftoken.l" ++#line 293 "cftoken.l" + { YYD; return(LIFETIME); } + YY_BREAK + case 114: + YY_RULE_SETUP +-#line 293 "cftoken.l" ++#line 294 "cftoken.l" + { YYD; return(LIFETYPE_TIME); } + YY_BREAK + case 115: + YY_RULE_SETUP +-#line 294 "cftoken.l" ++#line 295 "cftoken.l" + { YYD; return(LIFETYPE_BYTE); } + YY_BREAK + case 116: + YY_RULE_SETUP +-#line 295 "cftoken.l" ++#line 296 "cftoken.l" + { YYD; yylval.num = algclass_ipsec_enc; return(ALGORITHM_CLASS); } + YY_BREAK + case 117: + YY_RULE_SETUP +-#line 296 "cftoken.l" ++#line 297 "cftoken.l" + { YYD; yylval.num = algclass_ipsec_auth; return(ALGORITHM_CLASS); } + YY_BREAK + case 118: + YY_RULE_SETUP +-#line 297 "cftoken.l" ++#line 298 "cftoken.l" + { YYD; yylval.num = algclass_ipsec_comp; return(ALGORITHM_CLASS); } + YY_BREAK + case 119: + YY_RULE_SETUP +-#line 298 "cftoken.l" ++#line 299 "cftoken.l" + { YYD; return(COMMA); } + YY_BREAK + /* remote */ + case 120: + YY_RULE_SETUP +-#line 301 "cftoken.l" ++#line 302 "cftoken.l" + { BEGIN S_RMT; YYDB; return(REMOTE); } + YY_BREAK + case 121: + YY_RULE_SETUP +-#line 302 "cftoken.l" ++#line 303 "cftoken.l" + { YYD; return(ANONYMOUS); } + YY_BREAK + case 122: + YY_RULE_SETUP +-#line 303 "cftoken.l" ++#line 304 "cftoken.l" + { YYD; return(INHERIT); } + YY_BREAK + /* remote spec */ + case 123: + YY_RULE_SETUP +-#line 305 "cftoken.l" ++#line 306 "cftoken.l" + { BEGIN S_RMTS; return(BOC); } + YY_BREAK + case 124: + YY_RULE_SETUP +-#line 306 "cftoken.l" ++#line 307 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + case 125: + YY_RULE_SETUP +-#line 307 "cftoken.l" ++#line 308 "cftoken.l" + { YYD; return(EXCHANGE_MODE); } + YY_BREAK + case 126: + YY_RULE_SETUP +-#line 308 "cftoken.l" ++#line 309 "cftoken.l" + { YYD; /* XXX ignored, but to be handled. */ ; } + YY_BREAK + case 127: + YY_RULE_SETUP +-#line 309 "cftoken.l" ++#line 310 "cftoken.l" + { YYD; yylval.num = ISAKMP_ETYPE_BASE; return(EXCHANGETYPE); } + YY_BREAK + case 128: + YY_RULE_SETUP +-#line 310 "cftoken.l" ++#line 311 "cftoken.l" + { YYD; yylval.num = ISAKMP_ETYPE_IDENT; return(EXCHANGETYPE); } + YY_BREAK + case 129: + YY_RULE_SETUP +-#line 311 "cftoken.l" ++#line 312 "cftoken.l" + { YYD; yylval.num = ISAKMP_ETYPE_AGG; return(EXCHANGETYPE); } + YY_BREAK + case 130: + YY_RULE_SETUP +-#line 312 "cftoken.l" ++#line 313 "cftoken.l" + { YYD; return(DOI); } + YY_BREAK + case 131: + YY_RULE_SETUP +-#line 313 "cftoken.l" ++#line 314 "cftoken.l" + { YYD; yylval.num = IPSEC_DOI; return(DOITYPE); } + YY_BREAK + case 132: + YY_RULE_SETUP +-#line 314 "cftoken.l" ++#line 315 "cftoken.l" + { YYD; return(SITUATION); } + YY_BREAK + case 133: + YY_RULE_SETUP +-#line 315 "cftoken.l" ++#line 316 "cftoken.l" + { YYD; yylval.num = IPSECDOI_SIT_IDENTITY_ONLY; return(SITUATIONTYPE); } + YY_BREAK + case 134: + YY_RULE_SETUP +-#line 316 "cftoken.l" ++#line 317 "cftoken.l" + { YYD; yylval.num = IPSECDOI_SIT_SECRECY; return(SITUATIONTYPE); } + YY_BREAK + case 135: + YY_RULE_SETUP +-#line 317 "cftoken.l" ++#line 318 "cftoken.l" + { YYD; yylval.num = IPSECDOI_SIT_INTEGRITY; return(SITUATIONTYPE); } + YY_BREAK + case 136: + YY_RULE_SETUP +-#line 318 "cftoken.l" ++#line 319 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"my_identifier\"."); return(IDENTIFIER); } + YY_BREAK + case 137: + YY_RULE_SETUP +-#line 319 "cftoken.l" ++#line 320 "cftoken.l" + { YYD; return(MY_IDENTIFIER); } + YY_BREAK + case 138: + YY_RULE_SETUP +-#line 320 "cftoken.l" ++#line 321 "cftoken.l" + { YYD; return(XAUTH_LOGIN); /* formerly identifier type login */ } + YY_BREAK + case 139: + YY_RULE_SETUP +-#line 321 "cftoken.l" ++#line 322 "cftoken.l" + { YYD; return(PEERS_IDENTIFIER); } + YY_BREAK + case 140: + YY_RULE_SETUP +-#line 322 "cftoken.l" ++#line 323 "cftoken.l" + { YYD; return(VERIFY_IDENTIFIER); } + YY_BREAK + case 141: + YY_RULE_SETUP +-#line 323 "cftoken.l" ++#line 324 "cftoken.l" + { YYD; return(CERTIFICATE_TYPE); } + YY_BREAK + case 142: + YY_RULE_SETUP +-#line 324 "cftoken.l" ++#line 325 "cftoken.l" + { YYD; return(CA_TYPE); } + YY_BREAK + case 143: + YY_RULE_SETUP +-#line 325 "cftoken.l" ++#line 326 "cftoken.l" + { YYD; yylval.num = ISAKMP_CERT_X509SIGN; return(CERT_X509); } + YY_BREAK + case 144: + YY_RULE_SETUP +-#line 326 "cftoken.l" ++#line 327 "cftoken.l" + { YYD; yylval.num = ISAKMP_CERT_PLAINRSA; return(CERT_PLAINRSA); } + YY_BREAK + case 145: + YY_RULE_SETUP +-#line 327 "cftoken.l" ++#line 328 "cftoken.l" + { YYD; return(PEERS_CERTFILE); } + YY_BREAK + case 146: + YY_RULE_SETUP +-#line 328 "cftoken.l" ++#line 329 "cftoken.l" + { YYD; return(DNSSEC); } + YY_BREAK + case 147: + YY_RULE_SETUP +-#line 329 "cftoken.l" ++#line 330 "cftoken.l" + { YYD; return(VERIFY_CERT); } + YY_BREAK + case 148: + YY_RULE_SETUP +-#line 330 "cftoken.l" ++#line 331 "cftoken.l" + { YYD; return(SEND_CERT); } + YY_BREAK + case 149: + YY_RULE_SETUP +-#line 331 "cftoken.l" ++#line 332 "cftoken.l" + { YYD; return(SEND_CR); } + YY_BREAK + case 150: + YY_RULE_SETUP +-#line 332 "cftoken.l" ++#line 333 "cftoken.l" + { YYD; return(DH_GROUP); } + YY_BREAK + case 151: + YY_RULE_SETUP +-#line 333 "cftoken.l" ++#line 334 "cftoken.l" + { YYD; return(NONCE_SIZE); } + YY_BREAK + case 152: + YY_RULE_SETUP +-#line 334 "cftoken.l" ++#line 335 "cftoken.l" + { YYD; return(GENERATE_POLICY); } + YY_BREAK + case 153: + YY_RULE_SETUP +-#line 335 "cftoken.l" ++#line 336 "cftoken.l" + { YYD; yylval.num = GENERATE_POLICY_UNIQUE; return(GENERATE_LEVEL); } + YY_BREAK + case 154: + YY_RULE_SETUP +-#line 336 "cftoken.l" ++#line 337 "cftoken.l" + { YYD; yylval.num = GENERATE_POLICY_REQUIRE; return(GENERATE_LEVEL); } + YY_BREAK + case 155: + YY_RULE_SETUP +-#line 337 "cftoken.l" ++#line 338 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"support_proxy\"."); return(SUPPORT_PROXY); } + YY_BREAK + case 156: + YY_RULE_SETUP +-#line 338 "cftoken.l" ++#line 339 "cftoken.l" + { YYD; return(SUPPORT_PROXY); } + YY_BREAK + case 157: + YY_RULE_SETUP +-#line 339 "cftoken.l" ++#line 340 "cftoken.l" + { YYD; return(INITIAL_CONTACT); } + YY_BREAK + case 158: + YY_RULE_SETUP +-#line 340 "cftoken.l" ++#line 341 "cftoken.l" + { YYD; return(NAT_TRAVERSAL); } + YY_BREAK + case 159: + YY_RULE_SETUP +-#line 341 "cftoken.l" ++#line 342 "cftoken.l" + { YYD; return(REMOTE_FORCE_LEVEL); } + YY_BREAK + case 160: + YY_RULE_SETUP +-#line 342 "cftoken.l" ++#line 343 "cftoken.l" + { YYD; return(PROPOSAL_CHECK); } + YY_BREAK + case 161: + YY_RULE_SETUP +-#line 343 "cftoken.l" ++#line 344 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_OBEY; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 162: + YY_RULE_SETUP +-#line 344 "cftoken.l" ++#line 345 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_STRICT; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 163: + YY_RULE_SETUP +-#line 345 "cftoken.l" ++#line 346 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_EXACT; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 164: + YY_RULE_SETUP +-#line 346 "cftoken.l" ++#line 347 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_CLAIM; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 165: + YY_RULE_SETUP +-#line 347 "cftoken.l" ++#line 348 "cftoken.l" + { YYD; return(KEEPALIVE); } + YY_BREAK + case 166: + YY_RULE_SETUP +-#line 348 "cftoken.l" ++#line 349 "cftoken.l" + { YYD; return(PASSIVE); } + YY_BREAK + case 167: + YY_RULE_SETUP +-#line 349 "cftoken.l" ++#line 350 "cftoken.l" + { YYD; return(LIFETIME); } + YY_BREAK + case 168: + YY_RULE_SETUP +-#line 350 "cftoken.l" ++#line 351 "cftoken.l" + { YYD; return(LIFETYPE_TIME); } + YY_BREAK + case 169: + YY_RULE_SETUP +-#line 351 "cftoken.l" ++#line 352 "cftoken.l" + { YYD; return(LIFETYPE_BYTE); } + YY_BREAK + case 170: + YY_RULE_SETUP +-#line 352 "cftoken.l" ++#line 353 "cftoken.l" + { YYD; return(DPD); } + YY_BREAK + case 171: + YY_RULE_SETUP +-#line 353 "cftoken.l" ++#line 354 "cftoken.l" + { YYD; return(DPD_DELAY); } + YY_BREAK + case 172: + YY_RULE_SETUP +-#line 354 "cftoken.l" ++#line 355 "cftoken.l" + { YYD; return(DPD_RETRY); } + YY_BREAK + case 173: + YY_RULE_SETUP +-#line 355 "cftoken.l" ++#line 356 "cftoken.l" + { YYD; return(DPD_MAXFAIL); } + YY_BREAK + case 174: + YY_RULE_SETUP +-#line 356 "cftoken.l" ++#line 357 "cftoken.l" + { YYD; return(PH1ID); } + YY_BREAK + case 175: + YY_RULE_SETUP +-#line 357 "cftoken.l" ++#line 358 "cftoken.l" + { YYD; return(IKE_FRAG); } + YY_BREAK + case 176: + YY_RULE_SETUP +-#line 358 "cftoken.l" ++#line 359 "cftoken.l" + { YYD; return(ESP_FRAG); } + YY_BREAK + case 177: + YY_RULE_SETUP +-#line 359 "cftoken.l" ++#line 360 "cftoken.l" + { YYD; return(SCRIPT); } + YY_BREAK + case 178: + YY_RULE_SETUP +-#line 360 "cftoken.l" ++#line 361 "cftoken.l" + { YYD; return(PHASE1_UP); } + YY_BREAK + case 179: + YY_RULE_SETUP +-#line 361 "cftoken.l" ++#line 362 "cftoken.l" + { YYD; return(PHASE1_DOWN); } + YY_BREAK + case 180: + YY_RULE_SETUP +-#line 362 "cftoken.l" ++#line 363 "cftoken.l" + { YYD; return(MODE_CFG); } + YY_BREAK + case 181: + YY_RULE_SETUP +-#line 363 "cftoken.l" ++#line 364 "cftoken.l" + { YYD; return(WEAK_PHASE1_CHECK); } + YY_BREAK + /* remote proposal */ + case 182: + YY_RULE_SETUP +-#line 365 "cftoken.l" ++#line 366 "cftoken.l" + { BEGIN S_RMTP; YYDB; return(PROPOSAL); } + YY_BREAK + case 183: + YY_RULE_SETUP +-#line 366 "cftoken.l" ++#line 367 "cftoken.l" + { return(BOC); } + YY_BREAK + case 184: + YY_RULE_SETUP +-#line 367 "cftoken.l" ++#line 368 "cftoken.l" + { BEGIN S_RMTS; return(EOC); } + YY_BREAK + case 185: + YY_RULE_SETUP +-#line 368 "cftoken.l" ++#line 369 "cftoken.l" + { YYD; return(LIFETIME); } + YY_BREAK + case 186: + YY_RULE_SETUP +-#line 369 "cftoken.l" ++#line 370 "cftoken.l" + { YYD; return(LIFETYPE_TIME); } + YY_BREAK + case 187: + YY_RULE_SETUP +-#line 370 "cftoken.l" ++#line 371 "cftoken.l" + { YYD; return(LIFETYPE_BYTE); } + YY_BREAK + case 188: + YY_RULE_SETUP +-#line 371 "cftoken.l" ++#line 372 "cftoken.l" + { YYD; yylval.num = algclass_isakmp_enc; return(ALGORITHM_CLASS); } + YY_BREAK + case 189: + YY_RULE_SETUP +-#line 372 "cftoken.l" ++#line 373 "cftoken.l" + { YYD; yylval.num = algclass_isakmp_ameth; return(ALGORITHM_CLASS); } + YY_BREAK + case 190: + YY_RULE_SETUP +-#line 373 "cftoken.l" ++#line 374 "cftoken.l" + { YYD; yylval.num = algclass_isakmp_hash; return(ALGORITHM_CLASS); } + YY_BREAK + case 191: + YY_RULE_SETUP +-#line 374 "cftoken.l" ++#line 375 "cftoken.l" + { YYD; return(DH_GROUP); } + YY_BREAK + case 192: + YY_RULE_SETUP +-#line 375 "cftoken.l" ++#line 376 "cftoken.l" + { YYD; return(GSS_ID); } + YY_BREAK + case 193: + YY_RULE_SETUP +-#line 376 "cftoken.l" ++#line 377 "cftoken.l" + { YYD; return(GSS_ID); } /* for back compatibility */ + YY_BREAK + /* GSS ID encoding type (global) */ + case 194: + YY_RULE_SETUP +-#line 379 "cftoken.l" ++#line 380 "cftoken.l" + { BEGIN S_GSSENC; YYDB; return(GSS_ID_ENC); } + YY_BREAK + case 195: + YY_RULE_SETUP +-#line 380 "cftoken.l" ++#line 381 "cftoken.l" + { YYD; yylval.num = LC_GSSENC_LATIN1; + return(GSS_ID_ENCTYPE); } + YY_BREAK + case 196: + YY_RULE_SETUP +-#line 382 "cftoken.l" ++#line 383 "cftoken.l" + { YYD; yylval.num = LC_GSSENC_UTF16LE; + return(GSS_ID_ENCTYPE); } + YY_BREAK + case 197: + YY_RULE_SETUP +-#line 384 "cftoken.l" ++#line 385 "cftoken.l" + { BEGIN S_INI; YYDB; return(EOS); } + YY_BREAK + /* parameter */ + case 198: + YY_RULE_SETUP +-#line 387 "cftoken.l" ++#line 388 "cftoken.l" + { YYD; yylval.num = TRUE; return(SWITCH); } + YY_BREAK + case 199: + YY_RULE_SETUP +-#line 388 "cftoken.l" ++#line 389 "cftoken.l" + { YYD; yylval.num = FALSE; return(SWITCH); } + YY_BREAK + /* prefix */ + case 200: + YY_RULE_SETUP +-#line 391 "cftoken.l" ++#line 392 "cftoken.l" + { + YYD; + yytext++; +@@ -2947,7 +2970,7 @@ YY_RULE_SETUP + /* port number */ + case 201: + YY_RULE_SETUP +-#line 399 "cftoken.l" ++#line 400 "cftoken.l" + { + char *p = yytext; + YYD; +@@ -2961,7 +2984,7 @@ YY_RULE_SETUP + /* address range */ + case 202: + YY_RULE_SETUP +-#line 410 "cftoken.l" ++#line 411 "cftoken.l" + { + YYD; + yytext++; +@@ -2977,318 +3000,318 @@ YY_RULE_SETUP + /* upper protocol */ + case 203: + YY_RULE_SETUP +-#line 423 "cftoken.l" ++#line 424 "cftoken.l" + { YYD; yylval.num = IPPROTO_ESP; return(UL_PROTO); } + YY_BREAK + case 204: + YY_RULE_SETUP +-#line 424 "cftoken.l" ++#line 425 "cftoken.l" + { YYD; yylval.num = IPPROTO_AH; return(UL_PROTO); } + YY_BREAK + case 205: + YY_RULE_SETUP +-#line 425 "cftoken.l" ++#line 426 "cftoken.l" + { YYD; yylval.num = IPPROTO_IPCOMP; return(UL_PROTO); } + YY_BREAK + case 206: + YY_RULE_SETUP +-#line 426 "cftoken.l" ++#line 427 "cftoken.l" + { YYD; yylval.num = IPPROTO_ICMP; return(UL_PROTO); } + YY_BREAK + case 207: + YY_RULE_SETUP +-#line 427 "cftoken.l" ++#line 428 "cftoken.l" + { YYD; yylval.num = IPPROTO_ICMPV6; return(UL_PROTO); } + YY_BREAK + case 208: + YY_RULE_SETUP +-#line 428 "cftoken.l" ++#line 429 "cftoken.l" + { YYD; yylval.num = IPPROTO_TCP; return(UL_PROTO); } + YY_BREAK + case 209: + YY_RULE_SETUP +-#line 429 "cftoken.l" ++#line 430 "cftoken.l" + { YYD; yylval.num = IPPROTO_UDP; return(UL_PROTO); } + YY_BREAK + /* algorithm type */ + case 210: + YY_RULE_SETUP +-#line 432 "cftoken.l" ++#line 433 "cftoken.l" + { YYD; yylval.num = algtype_des_iv64; return(ALGORITHMTYPE); } + YY_BREAK + case 211: + YY_RULE_SETUP +-#line 433 "cftoken.l" ++#line 434 "cftoken.l" + { YYD; yylval.num = algtype_des; return(ALGORITHMTYPE); } + YY_BREAK + case 212: + YY_RULE_SETUP +-#line 434 "cftoken.l" ++#line 435 "cftoken.l" + { YYD; yylval.num = algtype_3des; return(ALGORITHMTYPE); } + YY_BREAK + case 213: + YY_RULE_SETUP +-#line 435 "cftoken.l" ++#line 436 "cftoken.l" + { YYD; yylval.num = algtype_rc5; return(ALGORITHMTYPE); } + YY_BREAK + case 214: + YY_RULE_SETUP +-#line 436 "cftoken.l" ++#line 437 "cftoken.l" + { YYD; yylval.num = algtype_idea; return(ALGORITHMTYPE); } + YY_BREAK + case 215: + YY_RULE_SETUP +-#line 437 "cftoken.l" ++#line 438 "cftoken.l" + { YYD; yylval.num = algtype_cast128; return(ALGORITHMTYPE); } + YY_BREAK + case 216: + YY_RULE_SETUP +-#line 438 "cftoken.l" ++#line 439 "cftoken.l" + { YYD; yylval.num = algtype_blowfish; return(ALGORITHMTYPE); } + YY_BREAK + case 217: + YY_RULE_SETUP +-#line 439 "cftoken.l" ++#line 440 "cftoken.l" + { YYD; yylval.num = algtype_3idea; return(ALGORITHMTYPE); } + YY_BREAK + case 218: + YY_RULE_SETUP +-#line 440 "cftoken.l" ++#line 441 "cftoken.l" + { YYD; yylval.num = algtype_des_iv32; return(ALGORITHMTYPE); } + YY_BREAK + case 219: + YY_RULE_SETUP +-#line 441 "cftoken.l" ++#line 442 "cftoken.l" + { YYD; yylval.num = algtype_rc4; return(ALGORITHMTYPE); } + YY_BREAK + case 220: + YY_RULE_SETUP +-#line 442 "cftoken.l" ++#line 443 "cftoken.l" + { YYD; yylval.num = algtype_null_enc; return(ALGORITHMTYPE); } + YY_BREAK + case 221: + YY_RULE_SETUP +-#line 443 "cftoken.l" ++#line 444 "cftoken.l" + { YYD; yylval.num = algtype_null_enc; return(ALGORITHMTYPE); } + YY_BREAK + case 222: + YY_RULE_SETUP +-#line 444 "cftoken.l" ++#line 445 "cftoken.l" + { YYD; yylval.num = algtype_aes; return(ALGORITHMTYPE); } + YY_BREAK + case 223: + YY_RULE_SETUP +-#line 445 "cftoken.l" ++#line 446 "cftoken.l" + { YYD; yylval.num = algtype_aes; return(ALGORITHMTYPE); } + YY_BREAK + case 224: + YY_RULE_SETUP +-#line 446 "cftoken.l" ++#line 447 "cftoken.l" + { YYD; yylval.num = algtype_twofish; return(ALGORITHMTYPE); } + YY_BREAK + case 225: + YY_RULE_SETUP +-#line 447 "cftoken.l" ++#line 448 "cftoken.l" + { YYD; yylval.num = algtype_camellia; return(ALGORITHMTYPE); } + YY_BREAK + case 226: + YY_RULE_SETUP +-#line 448 "cftoken.l" ++#line 449 "cftoken.l" + { YYD; yylval.num = algtype_non_auth; return(ALGORITHMTYPE); } + YY_BREAK + case 227: + YY_RULE_SETUP +-#line 449 "cftoken.l" ++#line 450 "cftoken.l" + { YYD; yylval.num = algtype_hmac_md5; return(ALGORITHMTYPE); } + YY_BREAK + case 228: + YY_RULE_SETUP +-#line 450 "cftoken.l" ++#line 451 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha1; return(ALGORITHMTYPE); } + YY_BREAK + case 229: + YY_RULE_SETUP +-#line 451 "cftoken.l" ++#line 452 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 230: + YY_RULE_SETUP +-#line 452 "cftoken.l" ++#line 453 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 231: + YY_RULE_SETUP +-#line 453 "cftoken.l" ++#line 454 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 232: + YY_RULE_SETUP +-#line 454 "cftoken.l" ++#line 455 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 233: + YY_RULE_SETUP +-#line 455 "cftoken.l" ++#line 456 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 234: + YY_RULE_SETUP +-#line 456 "cftoken.l" ++#line 457 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 235: + YY_RULE_SETUP +-#line 457 "cftoken.l" ++#line 458 "cftoken.l" + { YYD; yylval.num = algtype_des_mac; return(ALGORITHMTYPE); } + YY_BREAK + case 236: + YY_RULE_SETUP +-#line 458 "cftoken.l" ++#line 459 "cftoken.l" + { YYD; yylval.num = algtype_kpdk; return(ALGORITHMTYPE); } + YY_BREAK + case 237: + YY_RULE_SETUP +-#line 459 "cftoken.l" ++#line 460 "cftoken.l" + { YYD; yylval.num = algtype_md5; return(ALGORITHMTYPE); } + YY_BREAK + case 238: + YY_RULE_SETUP +-#line 460 "cftoken.l" ++#line 461 "cftoken.l" + { YYD; yylval.num = algtype_sha1; return(ALGORITHMTYPE); } + YY_BREAK + case 239: + YY_RULE_SETUP +-#line 461 "cftoken.l" ++#line 462 "cftoken.l" + { YYD; yylval.num = algtype_tiger; return(ALGORITHMTYPE); } + YY_BREAK + case 240: + YY_RULE_SETUP +-#line 462 "cftoken.l" ++#line 463 "cftoken.l" + { YYD; yylval.num = algtype_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 241: + YY_RULE_SETUP +-#line 463 "cftoken.l" ++#line 464 "cftoken.l" + { YYD; yylval.num = algtype_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 242: + YY_RULE_SETUP +-#line 464 "cftoken.l" ++#line 465 "cftoken.l" + { YYD; yylval.num = algtype_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 243: + YY_RULE_SETUP +-#line 465 "cftoken.l" ++#line 466 "cftoken.l" + { YYD; yylval.num = algtype_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 244: + YY_RULE_SETUP +-#line 466 "cftoken.l" ++#line 467 "cftoken.l" + { YYD; yylval.num = algtype_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 245: + YY_RULE_SETUP +-#line 467 "cftoken.l" ++#line 468 "cftoken.l" + { YYD; yylval.num = algtype_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 246: + YY_RULE_SETUP +-#line 468 "cftoken.l" ++#line 469 "cftoken.l" + { YYD; yylval.num = algtype_oui; return(ALGORITHMTYPE); } + YY_BREAK + case 247: + YY_RULE_SETUP +-#line 469 "cftoken.l" ++#line 470 "cftoken.l" + { YYD; yylval.num = algtype_deflate; return(ALGORITHMTYPE); } + YY_BREAK + case 248: + YY_RULE_SETUP +-#line 470 "cftoken.l" ++#line 471 "cftoken.l" + { YYD; yylval.num = algtype_lzs; return(ALGORITHMTYPE); } + YY_BREAK + case 249: + YY_RULE_SETUP +-#line 471 "cftoken.l" ++#line 472 "cftoken.l" + { YYD; yylval.num = algtype_modp768; return(ALGORITHMTYPE); } + YY_BREAK + case 250: + YY_RULE_SETUP +-#line 472 "cftoken.l" ++#line 473 "cftoken.l" + { YYD; yylval.num = algtype_modp1024; return(ALGORITHMTYPE); } + YY_BREAK + case 251: + YY_RULE_SETUP +-#line 473 "cftoken.l" ++#line 474 "cftoken.l" + { YYD; yylval.num = algtype_modp1536; return(ALGORITHMTYPE); } + YY_BREAK + case 252: + YY_RULE_SETUP +-#line 474 "cftoken.l" ++#line 475 "cftoken.l" + { YYD; yylval.num = algtype_ec2n155; return(ALGORITHMTYPE); } + YY_BREAK + case 253: + YY_RULE_SETUP +-#line 475 "cftoken.l" ++#line 476 "cftoken.l" + { YYD; yylval.num = algtype_ec2n185; return(ALGORITHMTYPE); } + YY_BREAK + case 254: + YY_RULE_SETUP +-#line 476 "cftoken.l" ++#line 477 "cftoken.l" + { YYD; yylval.num = algtype_modp2048; return(ALGORITHMTYPE); } + YY_BREAK + case 255: + YY_RULE_SETUP +-#line 477 "cftoken.l" ++#line 478 "cftoken.l" + { YYD; yylval.num = algtype_modp3072; return(ALGORITHMTYPE); } + YY_BREAK + case 256: + YY_RULE_SETUP +-#line 478 "cftoken.l" ++#line 479 "cftoken.l" + { YYD; yylval.num = algtype_modp4096; return(ALGORITHMTYPE); } + YY_BREAK + case 257: + YY_RULE_SETUP +-#line 479 "cftoken.l" ++#line 480 "cftoken.l" + { YYD; yylval.num = algtype_modp6144; return(ALGORITHMTYPE); } + YY_BREAK + case 258: + YY_RULE_SETUP +-#line 480 "cftoken.l" ++#line 481 "cftoken.l" + { YYD; yylval.num = algtype_modp8192; return(ALGORITHMTYPE); } + YY_BREAK + case 259: + YY_RULE_SETUP +-#line 481 "cftoken.l" ++#line 482 "cftoken.l" + { YYD; yylval.num = algtype_psk; return(ALGORITHMTYPE); } + YY_BREAK + case 260: + YY_RULE_SETUP +-#line 482 "cftoken.l" ++#line 483 "cftoken.l" + { YYD; yylval.num = algtype_rsasig; return(ALGORITHMTYPE); } + YY_BREAK + case 261: + YY_RULE_SETUP +-#line 483 "cftoken.l" ++#line 484 "cftoken.l" + { YYD; yylval.num = algtype_dsssig; return(ALGORITHMTYPE); } + YY_BREAK + case 262: + YY_RULE_SETUP +-#line 484 "cftoken.l" ++#line 485 "cftoken.l" + { YYD; yylval.num = algtype_rsaenc; return(ALGORITHMTYPE); } + YY_BREAK + case 263: + YY_RULE_SETUP +-#line 485 "cftoken.l" ++#line 486 "cftoken.l" + { YYD; yylval.num = algtype_rsarev; return(ALGORITHMTYPE); } + YY_BREAK + case 264: + YY_RULE_SETUP +-#line 486 "cftoken.l" ++#line 487 "cftoken.l" + { YYD; yylval.num = algtype_gssapikrb; return(ALGORITHMTYPE); } + YY_BREAK + case 265: + YY_RULE_SETUP +-#line 487 "cftoken.l" ++#line 488 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_rsa_s; return(ALGORITHMTYPE); +@@ -3299,7 +3322,7 @@ YY_RULE_SETUP + YY_BREAK + case 266: + YY_RULE_SETUP +-#line 494 "cftoken.l" ++#line 495 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_dss_s; return(ALGORITHMTYPE); +@@ -3310,7 +3333,7 @@ YY_RULE_SETUP + YY_BREAK + case 267: + YY_RULE_SETUP +-#line 501 "cftoken.l" ++#line 502 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_rsa_c; return(ALGORITHMTYPE); +@@ -3321,7 +3344,7 @@ YY_RULE_SETUP + YY_BREAK + case 268: + YY_RULE_SETUP +-#line 508 "cftoken.l" ++#line 509 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_dss_c; return(ALGORITHMTYPE); +@@ -3332,7 +3355,7 @@ YY_RULE_SETUP + YY_BREAK + case 269: + YY_RULE_SETUP +-#line 515 "cftoken.l" ++#line 516 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_psk_s; return(ALGORITHMTYPE); +@@ -3343,7 +3366,7 @@ YY_RULE_SETUP + YY_BREAK + case 270: + YY_RULE_SETUP +-#line 522 "cftoken.l" ++#line 523 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_psk_c; return(ALGORITHMTYPE); +@@ -3354,7 +3377,7 @@ YY_RULE_SETUP + YY_BREAK + case 271: + YY_RULE_SETUP +-#line 529 "cftoken.l" ++#line 530 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_rsa_s; return(ALGORITHMTYPE); +@@ -3365,7 +3388,7 @@ YY_RULE_SETUP + YY_BREAK + case 272: + YY_RULE_SETUP +-#line 536 "cftoken.l" ++#line 537 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_rsa_c; return(ALGORITHMTYPE); +@@ -3377,105 +3400,105 @@ YY_RULE_SETUP + /* identifier type */ + case 273: + YY_RULE_SETUP +-#line 546 "cftoken.l" ++#line 547 "cftoken.l" + { YYD; yywarn("it is obsoleted."); return(VENDORID); } + YY_BREAK + case 274: + YY_RULE_SETUP +-#line 547 "cftoken.l" ++#line 548 "cftoken.l" + { YYD; yylval.num = IDTYPE_USERFQDN; return(IDENTIFIERTYPE); } + YY_BREAK + case 275: + YY_RULE_SETUP +-#line 548 "cftoken.l" ++#line 549 "cftoken.l" + { YYD; yylval.num = IDTYPE_FQDN; return(IDENTIFIERTYPE); } + YY_BREAK + case 276: + YY_RULE_SETUP +-#line 549 "cftoken.l" ++#line 550 "cftoken.l" + { YYD; yylval.num = IDTYPE_KEYID; return(IDENTIFIERTYPE); } + YY_BREAK + case 277: + YY_RULE_SETUP +-#line 550 "cftoken.l" ++#line 551 "cftoken.l" + { YYD; yylval.num = IDTYPE_ADDRESS; return(IDENTIFIERTYPE); } + YY_BREAK + case 278: + YY_RULE_SETUP +-#line 551 "cftoken.l" ++#line 552 "cftoken.l" + { YYD; yylval.num = IDTYPE_SUBNET; return(IDENTIFIERTYPE); } + YY_BREAK + case 279: + YY_RULE_SETUP +-#line 552 "cftoken.l" ++#line 553 "cftoken.l" + { YYD; yylval.num = IDTYPE_ASN1DN; return(IDENTIFIERTYPE); } + YY_BREAK + case 280: + YY_RULE_SETUP +-#line 553 "cftoken.l" ++#line 554 "cftoken.l" + { YYD; yywarn("certname will be obsoleted in near future."); yylval.num = IDTYPE_ASN1DN; return(IDENTIFIERTYPE); } + YY_BREAK + /* identifier qualifier */ + case 281: + YY_RULE_SETUP +-#line 556 "cftoken.l" ++#line 557 "cftoken.l" + { YYD; yylval.num = IDQUAL_TAG; return(IDENTIFIERQUAL); } + YY_BREAK + case 282: + YY_RULE_SETUP +-#line 557 "cftoken.l" ++#line 558 "cftoken.l" + { YYD; yylval.num = IDQUAL_FILE; return(IDENTIFIERQUAL); } + YY_BREAK + /* units */ + case 283: + YY_RULE_SETUP +-#line 560 "cftoken.l" ++#line 561 "cftoken.l" + { YYD; return(UNITTYPE_BYTE); } + YY_BREAK + case 284: + YY_RULE_SETUP +-#line 561 "cftoken.l" ++#line 562 "cftoken.l" + { YYD; return(UNITTYPE_KBYTES); } + YY_BREAK + case 285: + YY_RULE_SETUP +-#line 562 "cftoken.l" ++#line 563 "cftoken.l" + { YYD; return(UNITTYPE_MBYTES); } + YY_BREAK + case 286: + YY_RULE_SETUP +-#line 563 "cftoken.l" ++#line 564 "cftoken.l" + { YYD; return(UNITTYPE_TBYTES); } + YY_BREAK + case 287: + YY_RULE_SETUP +-#line 564 "cftoken.l" ++#line 565 "cftoken.l" + { YYD; return(UNITTYPE_SEC); } + YY_BREAK + case 288: + YY_RULE_SETUP +-#line 565 "cftoken.l" ++#line 566 "cftoken.l" + { YYD; return(UNITTYPE_MIN); } + YY_BREAK + case 289: + YY_RULE_SETUP +-#line 566 "cftoken.l" ++#line 567 "cftoken.l" + { YYD; return(UNITTYPE_HOUR); } + YY_BREAK + /* boolean */ + case 290: + YY_RULE_SETUP +-#line 569 "cftoken.l" ++#line 570 "cftoken.l" + { YYD; yylval.num = TRUE; return(BOOLEAN); } + YY_BREAK + case 291: + YY_RULE_SETUP +-#line 570 "cftoken.l" ++#line 571 "cftoken.l" + { YYD; yylval.num = FALSE; return(BOOLEAN); } + YY_BREAK + case 292: + YY_RULE_SETUP +-#line 572 "cftoken.l" ++#line 573 "cftoken.l" + { + char *bp; + +@@ -3486,7 +3509,7 @@ YY_RULE_SETUP + YY_BREAK + case 293: + YY_RULE_SETUP +-#line 580 "cftoken.l" ++#line 581 "cftoken.l" + { + char *p; + +@@ -3512,7 +3535,7 @@ YY_RULE_SETUP + case 294: + /* rule 294 can match eol */ + YY_RULE_SETUP +-#line 602 "cftoken.l" ++#line 603 "cftoken.l" + { + char *p = yytext; + +@@ -3532,7 +3555,7 @@ YY_RULE_SETUP + YY_BREAK + case 295: + YY_RULE_SETUP +-#line 619 "cftoken.l" ++#line 620 "cftoken.l" + { + YYD; + +@@ -3566,7 +3589,7 @@ case YY_STATE_EOF(S_RMTS): + case YY_STATE_EOF(S_RMTP): + case YY_STATE_EOF(S_SA): + case YY_STATE_EOF(S_GSSENC): +-#line 632 "cftoken.l" ++#line 633 "cftoken.l" + { + yy_delete_buffer(YY_CURRENT_BUFFER); + incstackp--; +@@ -3594,36 +3617,36 @@ case YY_STATE_EOF(S_GSSENC): + /* ... */ + case 296: + YY_RULE_SETUP +-#line 657 "cftoken.l" ++#line 658 "cftoken.l" + { ; } + YY_BREAK + case 297: + /* rule 297 can match eol */ + YY_RULE_SETUP +-#line 658 "cftoken.l" ++#line 659 "cftoken.l" + { incstack[incstackp].lineno++; } + YY_BREAK + case 298: + YY_RULE_SETUP +-#line 659 "cftoken.l" ++#line 660 "cftoken.l" + { YYD; } + YY_BREAK + case 299: + YY_RULE_SETUP +-#line 660 "cftoken.l" ++#line 661 "cftoken.l" + { return(EOS); } + YY_BREAK + case 300: + YY_RULE_SETUP +-#line 661 "cftoken.l" ++#line 662 "cftoken.l" + { yymore(); } + YY_BREAK + case 301: + YY_RULE_SETUP +-#line 663 "cftoken.l" ++#line 664 "cftoken.l" + ECHO; + YY_BREAK +-#line 3627 "cftoken.c" ++#line 3650 "cftoken.c" + + case YY_END_OF_BUFFER: + { +@@ -4171,9 +4194,19 @@ static void yy_load_buffer_state (void) + yyfree((void *) b ); + } + +-#ifndef __cplusplus ++#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */ ++#ifdef __cplusplus ++extern "C" { ++#endif ++#ifdef __THROW /* this is a gnuism */ ++extern int isatty (int ) __THROW; ++#else + extern int isatty (int ); +-#endif /* __cplusplus */ ++#endif ++#ifdef __cplusplus ++} ++#endif ++#endif + + /* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, +@@ -4619,7 +4652,7 @@ void yyfree (void * ptr ) + + #define YYTABLES_NAME "yytables" + +-#line 663 "cftoken.l" ++#line 664 "cftoken.l" + + + diff --git a/package/ipsec-tools/patches/patch-src_racoon_cftoken_l b/package/ipsec-tools/patches/patch-src_racoon_cftoken_l new file mode 100644 index 000000000..8ada6f602 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_cftoken_l @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/cftoken.l 2007-09-03 20:07:29.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/cftoken.l 2009-05-29 15:46:06.836399719 +0200 +@@ -104,6 +104,7 @@ static struct include_stack { + static int incstackp = 0; + + static int yy_first_time = 1; ++int yywrap(void) { return 1; } + %} + + /* common seciton */ diff --git a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c index cc10bca3b..76c6a62cc 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c +++ b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c @@ -1,5 +1,6 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/crypto_openssl.c 2010-10-20 15:40:02.000000000 +0200 -+++ ipsec-tools-0.8.0/src/racoon/crypto_openssl.c 2011-03-31 13:22:18.821818767 +0200 +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/crypto_openssl.c 2009-04-20 15:33:30.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/crypto_openssl.c 2009-05-29 15:31:04.728378359 +0200 @@ -63,8 +63,12 @@ #ifdef HAVE_OPENSSL_ENGINE_H #include @@ -13,7 +14,7 @@ #include #ifdef HAVE_OPENSSL_RC5_H #include -@@ -1405,6 +1409,7 @@ eay_idea_keylen(len) +@@ -1347,6 +1351,7 @@ eay_idea_keylen(len) } #endif @@ -21,7 +22,7 @@ /* * BLOWFISH-CBC */ -@@ -1439,6 +1444,7 @@ eay_bf_keylen(len) +@@ -1381,6 +1386,7 @@ eay_bf_keylen(len) return -1; return len; } @@ -29,7 +30,7 @@ #ifdef HAVE_OPENSSL_RC5_H /* -@@ -1550,6 +1556,7 @@ eay_3des_keylen(len) +@@ -1492,6 +1498,7 @@ eay_3des_keylen(len) return 192; } @@ -37,7 +38,7 @@ /* * CAST-CBC */ -@@ -1584,6 +1591,7 @@ eay_cast_keylen(len) +@@ -1526,6 +1533,7 @@ eay_cast_keylen(len) return -1; return len; } diff --git a/package/ipsec-tools/patches/patch-src_racoon_eaytest_c b/package/ipsec-tools/patches/patch-src_racoon_eaytest_c index 86a5ff77e..a7d7807c4 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_eaytest_c +++ b/package/ipsec-tools/patches/patch-src_racoon_eaytest_c @@ -1,6 +1,7 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/eaytest.c 2010-01-18 00:02:48.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/eaytest.c 2011-03-31 13:23:53.361808366 +0200 -@@ -684,19 +684,23 @@ ciphertest(ac, av) +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/eaytest.c 2008-07-16 10:50:02.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/eaytest.c 2009-05-29 15:33:04.286374004 +0200 +@@ -683,19 +683,23 @@ ciphertest(ac, av) eay_aes_encrypt, eay_aes_decrypt) < 0) return -1; diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c index 63825a34d..7b612f035 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c +++ b/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c @@ -1,6 +1,7 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/isakmp_xauth.c 2011-03-14 16:50:36.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/isakmp_xauth.c 2011-03-31 13:23:58.351808486 +0200 -@@ -655,7 +655,7 @@ PAM_conv(msg_count, msg, rsp, dontcare) +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/isakmp_xauth.c 2009-04-20 15:35:36.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/isakmp_xauth.c 2009-05-29 15:56:30.460377529 +0200 +@@ -585,7 +585,7 @@ PAM_conv(msg_count, msg, rsp, dontcare) if ((reply = racoon_malloc(sizeof(*reply) * msg_count)) == NULL) return PAM_CONV_ERR; diff --git a/package/ipsec-tools/patches/patch-src_racoon_pfkey_c b/package/ipsec-tools/patches/patch-src_racoon_pfkey_c index d0c416d83..cedbc5cdd 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_pfkey_c +++ b/package/ipsec-tools/patches/patch-src_racoon_pfkey_c @@ -1,6 +1,7 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/pfkey.c 2011-03-15 14:20:14.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/pfkey.c 2011-03-31 13:24:03.781819000 +0200 -@@ -3855,12 +3855,12 @@ addnewsp(mhp, local, remote) +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/pfkey.c 2008-12-08 07:06:24.000000000 +0100 ++++ ipsec-tools-0.7.2/src/racoon/pfkey.c 2009-05-29 15:48:49.201433105 +0200 +@@ -3008,12 +3008,12 @@ addnewsp(mhp) struct sockaddr *paddr; paddr = (struct sockaddr *)(xisr + 1); diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c index e8f678186..c69abd264 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_privsep_c +++ b/package/ipsec-tools/patches/patch-src_racoon_privsep_c @@ -1,6 +1,7 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/privsep.c 2011-03-06 09:28:10.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/privsep.c 2011-03-31 13:24:07.981813178 +0200 -@@ -359,7 +359,7 @@ privsep_init(void) +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/privsep.c 2008-12-08 07:06:24.000000000 +0100 ++++ ipsec-tools-0.7.2/src/racoon/privsep.c 2009-05-29 15:55:47.787585131 +0200 +@@ -323,7 +323,7 @@ privsep_init(void) strerror(errno)); goto out; } @@ -9,7 +10,7 @@ reply->hdr.ac_cmd = combuf->hdr.ac_cmd; reply->hdr.ac_len = sizeof(*reply); -@@ -457,7 +457,7 @@ privsep_init(void) +@@ -421,7 +421,7 @@ privsep_init(void) strerror(errno)); goto out; } @@ -18,7 +19,7 @@ /* -@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) +@@ -716,7 +716,7 @@ privsep_eay_get_pkcs1privkey(path) "Cannot allocate memory: %s\n", strerror(errno)); return NULL; } @@ -27,7 +28,7 @@ msg->hdr.ac_cmd = PRIVSEP_EAY_GET_PKCS1PRIVKEY; msg->hdr.ac_len = len; msg->bufs.buflen[0] = len - sizeof(*msg); -@@ -953,7 +953,7 @@ privsep_script_exec(script, name, envp) +@@ -797,7 +797,7 @@ privsep_script_exec(script, name, envp) return -1; } @@ -36,7 +37,7 @@ msg->hdr.ac_cmd = PRIVSEP_SCRIPT_EXEC; msg->hdr.ac_len = sizeof(*msg); -@@ -1062,7 +1062,7 @@ privsep_getpsk(str, keylen) +@@ -906,7 +906,7 @@ privsep_getpsk(str, keylen) "Cannot allocate memory: %s\n", strerror(errno)); return NULL; } @@ -45,7 +46,7 @@ msg->hdr.ac_cmd = PRIVSEP_GETPSK; msg->hdr.ac_len = len; -@@ -1334,7 +1334,7 @@ privsep_xauth_login_system(usr, pwd) +@@ -960,7 +960,7 @@ privsep_xauth_login_system(usr, pwd) "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -54,7 +55,7 @@ msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_SYSTEM; msg->hdr.ac_len = len; -@@ -1389,7 +1389,7 @@ privsep_accounting_system(port, raddr, u +@@ -1014,7 +1014,7 @@ privsep_accounting_system(port, raddr, u "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -63,7 +64,7 @@ msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_SYSTEM; msg->hdr.ac_len = len; msg->bufs.buflen[0] = sizeof(port); -@@ -1643,7 +1643,7 @@ privsep_accounting_pam(port, inout) +@@ -1187,7 +1187,7 @@ privsep_accounting_pam(port, inout) "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -72,7 +73,7 @@ msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_PAM; msg->hdr.ac_len = len; msg->bufs.buflen[0] = sizeof(port); -@@ -1705,7 +1705,7 @@ privsep_xauth_login_pam(port, raddr, usr +@@ -1248,7 +1248,7 @@ privsep_xauth_login_pam(port, raddr, usr "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -81,7 +82,7 @@ msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_PAM; msg->hdr.ac_len = len; msg->bufs.buflen[0] = sizeof(port); -@@ -1770,7 +1770,7 @@ privsep_cleanup_pam(port) +@@ -1312,7 +1312,7 @@ privsep_cleanup_pam(port) "Cannot allocate memory: %s\n", strerror(errno)); return; } diff --git a/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c b/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c index 3b998fe24..d5d6267c6 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c +++ b/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c @@ -1,6 +1,7 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/racoonctl.c 2010-11-12 10:08:26.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/racoonctl.c 2011-03-31 13:24:13.201808233 +0200 -@@ -693,7 +693,7 @@ f_vpnc(ac, av) +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/racoonctl.c 2009-04-20 15:32:57.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/racoonctl.c 2009-05-29 15:57:45.600377208 +0200 +@@ -785,7 +785,7 @@ f_vpnc(ac, av) errx(1, "cannot read source address"); /* We get "ip[port]" strip the port */ diff --git a/package/ipsec-tools/patches/patch-src_setkey_token_c b/package/ipsec-tools/patches/patch-src_setkey_token_c new file mode 100644 index 000000000..1c0231885 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_setkey_token_c @@ -0,0 +1,707 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/setkey/token.c 2008-07-23 10:26:58.000000000 +0200 ++++ ipsec-tools-0.7.2/src/setkey/token.c 2009-05-29 15:26:39.126303087 +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; +@@ -1069,9 +1062,10 @@ char *yytext; + #if defined(SADB_X_EALG_AES) && ! defined(SADB_X_EALG_AESCBC) + #define SADB_X_EALG_AESCBC SADB_X_EALG_AES + #endif ++int yywrap(void) { return 1; } + /* common section */ + +-#line 1075 "token.c" ++#line 1069 "token.c" + + #define INITIAL 0 + #define S_PL 1 +@@ -1092,6 +1086,35 @@ char *yytext; + + 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. + */ +@@ -1227,10 +1250,10 @@ YY_DECL + register char *yy_cp, *yy_bp; + register int yy_act; + +-#line 114 "token.l" ++#line 115 "token.l" + + +-#line 1234 "token.c" ++#line 1257 "token.c" + + if ( !(yy_init) ) + { +@@ -1321,84 +1344,84 @@ do_action: /* This label is used only to + + case 1: + YY_RULE_SETUP +-#line 116 "token.l" ++#line 117 "token.l" + { return(ADD); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 117 "token.l" ++#line 118 "token.l" + { return(DELETE); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 118 "token.l" ++#line 119 "token.l" + { return(DELETEALL); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 119 "token.l" ++#line 120 "token.l" + { return(GET); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 120 "token.l" ++#line 121 "token.l" + { return(FLUSH); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 121 "token.l" ++#line 122 "token.l" + { return(DUMP); } + YY_BREAK + case 7: + YY_RULE_SETUP +-#line 122 "token.l" ++#line 123 "token.l" + { return(EXIT); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 123 "token.l" ++#line 124 "token.l" + { return(EXIT); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 124 "token.l" ++#line 125 "token.l" + { return(EXIT); } + YY_BREAK + /* for management SPD */ + case 10: + YY_RULE_SETUP +-#line 127 "token.l" ++#line 128 "token.l" + { return(SPDADD); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 128 "token.l" ++#line 129 "token.l" + { return(SPDDELETE); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 129 "token.l" ++#line 130 "token.l" + { return(SPDDUMP); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 130 "token.l" ++#line 131 "token.l" + { return(SPDFLUSH); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 131 "token.l" ++#line 132 "token.l" + { return(TAGGED); } + YY_BREAK + case 15: + YY_RULE_SETUP +-#line 132 "token.l" ++#line 133 "token.l" + { BEGIN S_PL; return(F_POLICY); } + YY_BREAK + case 16: + /* rule 16 can match eol */ + YY_RULE_SETUP +-#line 133 "token.l" ++#line 134 "token.l" + { + yymore(); + +@@ -1420,13 +1443,13 @@ YY_RULE_SETUP + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 151 "token.l" ++#line 152 "token.l" + { BEGIN INITIAL; return(EOT); } + YY_BREAK + /* address resolution flags */ + case 18: + YY_RULE_SETUP +-#line 154 "token.l" ++#line 155 "token.l" + { + yylval.val.len = strlen(yytext); + yylval.val.buf = strdup(yytext); +@@ -1438,37 +1461,37 @@ YY_RULE_SETUP + /* security protocols */ + case 19: + YY_RULE_SETUP +-#line 163 "token.l" ++#line 164 "token.l" + { yylval.num = 0; return(PR_AH); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 164 "token.l" ++#line 165 "token.l" + { yylval.num = 0; return(PR_ESP); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 165 "token.l" ++#line 166 "token.l" + { yylval.num = 1; return(PR_AH); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 166 "token.l" ++#line 167 "token.l" + { yylval.num = 1; return(PR_ESP); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 167 "token.l" ++#line 168 "token.l" + { yylval.num = 0; return(PR_ESPUDP); } + YY_BREAK + case 24: + YY_RULE_SETUP +-#line 168 "token.l" ++#line 169 "token.l" + { yylval.num = 0; return(PR_IPCOMP); } + YY_BREAK + case 25: + YY_RULE_SETUP +-#line 169 "token.l" ++#line 170 "token.l" + { + yylval.num = 0; return(PR_TCP); + } +@@ -1476,72 +1499,72 @@ YY_RULE_SETUP + /* authentication alogorithm */ + case 26: + YY_RULE_SETUP +-#line 174 "token.l" ++#line 175 "token.l" + { BEGIN S_AUTHALG; return(F_AUTH); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 175 "token.l" ++#line 176 "token.l" + { yylval.num = SADB_AALG_MD5HMAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 176 "token.l" ++#line 177 "token.l" + { yylval.num = SADB_AALG_SHA1HMAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 29: + YY_RULE_SETUP +-#line 177 "token.l" ++#line 178 "token.l" + { yylval.num = SADB_X_AALG_MD5; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 178 "token.l" ++#line 179 "token.l" + { yylval.num = SADB_X_AALG_SHA; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 179 "token.l" ++#line 180 "token.l" + { yylval.num = SADB_X_AALG_SHA2_256; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 180 "token.l" ++#line 181 "token.l" + { yylval.num = SADB_X_AALG_SHA2_256; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 181 "token.l" ++#line 182 "token.l" + { yylval.num = SADB_X_AALG_SHA2_384; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 182 "token.l" ++#line 183 "token.l" + { yylval.num = SADB_X_AALG_SHA2_384; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 183 "token.l" ++#line 184 "token.l" + { yylval.num = SADB_X_AALG_SHA2_512; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 184 "token.l" ++#line 185 "token.l" + { yylval.num = SADB_X_AALG_SHA2_512; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 37: + YY_RULE_SETUP +-#line 185 "token.l" ++#line 186 "token.l" + { yylval.num = SADB_X_AALG_RIPEMD160HMAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 186 "token.l" ++#line 187 "token.l" + { yylval.num = SADB_X_AALG_AES_XCBC_MAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 187 "token.l" ++#line 188 "token.l" + { + #ifdef SADB_X_AALG_TCP_MD5 + yylval.num = SADB_X_AALG_TCP_MD5; +@@ -1552,63 +1575,63 @@ YY_RULE_SETUP + YY_BREAK + case 40: + YY_RULE_SETUP +-#line 194 "token.l" ++#line 195 "token.l" + { yylval.num = SADB_X_AALG_NULL; BEGIN INITIAL; return(ALG_AUTH_NOKEY); } + YY_BREAK + /* encryption alogorithm */ + case 41: + YY_RULE_SETUP +-#line 197 "token.l" ++#line 198 "token.l" + { BEGIN S_ENCALG; return(F_ENC); } + YY_BREAK + case 42: + YY_RULE_SETUP +-#line 198 "token.l" ++#line 199 "token.l" + { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 43: + YY_RULE_SETUP +-#line 199 "token.l" ++#line 200 "token.l" + { yylval.num = SADB_EALG_3DESCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 44: + YY_RULE_SETUP +-#line 200 "token.l" ++#line 201 "token.l" + { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_NOKEY); } + YY_BREAK + case 45: + YY_RULE_SETUP +-#line 201 "token.l" ++#line 202 "token.l" + { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_OLD); } + YY_BREAK + case 46: + YY_RULE_SETUP +-#line 202 "token.l" ++#line 203 "token.l" + { yylval.num = SADB_X_EALG_BLOWFISHCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 47: + YY_RULE_SETUP +-#line 203 "token.l" ++#line 204 "token.l" + { yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 48: + YY_RULE_SETUP +-#line 204 "token.l" ++#line 205 "token.l" + { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DESDERIV); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 205 "token.l" ++#line 206 "token.l" + { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DES32IV); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 206 "token.l" ++#line 207 "token.l" + { yylval.num = SADB_X_EALG_TWOFISHCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 207 "token.l" ++#line 208 "token.l" + { + #ifdef SADB_X_EALG_AESCBC + yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); +@@ -1617,7 +1640,7 @@ YY_RULE_SETUP + YY_BREAK + case 52: + YY_RULE_SETUP +-#line 212 "token.l" ++#line 213 "token.l" + { + #ifdef SADB_X_EALG_AESCBC + yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); +@@ -1626,12 +1649,12 @@ YY_RULE_SETUP + YY_BREAK + case 53: + YY_RULE_SETUP +-#line 217 "token.l" ++#line 218 "token.l" + { yylval.num = SADB_X_EALG_AESCTR; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 218 "token.l" ++#line 219 "token.l" + { + #ifdef SADB_X_EALG_CAMELLIACBC + yylval.num = SADB_X_EALG_CAMELLIACBC; BEGIN INITIAL; return(ALG_ENC); +@@ -1641,152 +1664,152 @@ YY_RULE_SETUP + /* compression algorithms */ + case 55: + YY_RULE_SETUP +-#line 225 "token.l" ++#line 226 "token.l" + { return(F_COMP); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 226 "token.l" ++#line 227 "token.l" + { yylval.num = SADB_X_CALG_OUI; return(ALG_COMP); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 227 "token.l" ++#line 228 "token.l" + { yylval.num = SADB_X_CALG_DEFLATE; return(ALG_COMP); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 228 "token.l" ++#line 229 "token.l" + { yylval.num = SADB_X_CALG_LZS; return(ALG_COMP); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 229 "token.l" ++#line 230 "token.l" + { return(F_RAWCPI); } + YY_BREAK + /* extension */ + case 60: + YY_RULE_SETUP +-#line 232 "token.l" ++#line 233 "token.l" + { return(F_MODE); } + YY_BREAK + case 61: + YY_RULE_SETUP +-#line 233 "token.l" ++#line 234 "token.l" + { yylval.num = IPSEC_MODE_TRANSPORT; return(MODE); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 234 "token.l" ++#line 235 "token.l" + { yylval.num = IPSEC_MODE_TUNNEL; return(MODE); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 235 "token.l" ++#line 236 "token.l" + { return(F_REQID); } + YY_BREAK + case 64: + YY_RULE_SETUP +-#line 236 "token.l" ++#line 237 "token.l" + { return(F_EXT); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 237 "token.l" ++#line 238 "token.l" + { yylval.num = SADB_X_EXT_PRAND; return(EXTENSION); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 238 "token.l" ++#line 239 "token.l" + { yylval.num = SADB_X_EXT_PSEQ; return(EXTENSION); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 239 "token.l" ++#line 240 "token.l" + { yylval.num = SADB_X_EXT_PZERO; return(EXTENSION); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 240 "token.l" ++#line 241 "token.l" + { return(NOCYCLICSEQ); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 241 "token.l" ++#line 242 "token.l" + { return(F_REPLAY); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 242 "token.l" ++#line 243 "token.l" + { return(F_LIFETIME_HARD); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 243 "token.l" ++#line 244 "token.l" + { return(F_LIFETIME_SOFT); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 244 "token.l" ++#line 245 "token.l" + { return(F_LIFEBYTE_HARD); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 245 "token.l" ++#line 246 "token.l" + { return(F_LIFEBYTE_SOFT); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 246 "token.l" ++#line 247 "token.l" + { return(SECURITY_CTX); } + YY_BREAK + /* ... */ + case 75: + YY_RULE_SETUP +-#line 249 "token.l" ++#line 250 "token.l" + { return(ANY); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 250 "token.l" ++#line 251 "token.l" + { } + YY_BREAK + case 77: + /* rule 77 can match eol */ + YY_RULE_SETUP +-#line 251 "token.l" ++#line 252 "token.l" + { lineno++; } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 252 "token.l" ++#line 253 "token.l" + + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 253 "token.l" ++#line 254 "token.l" + { return(EOT); } + YY_BREAK + /* for address parameters: /prefix, [port] */ + case 80: + YY_RULE_SETUP +-#line 256 "token.l" ++#line 257 "token.l" + { return SLASH; } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 257 "token.l" ++#line 258 "token.l" + { return BLCL; } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 258 "token.l" ++#line 259 "token.l" + { return ELCL; } + YY_BREAK + /* parameter */ + case 83: + YY_RULE_SETUP +-#line 261 "token.l" ++#line 262 "token.l" + { + char *bp; + +@@ -1796,7 +1819,7 @@ YY_RULE_SETUP + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 268 "token.l" ++#line 269 "token.l" + { + yylval.val.buf = strdup(yytext + 2); + if (!yylval.val.buf) +@@ -1809,7 +1832,7 @@ YY_RULE_SETUP + case 85: + /* rule 85 can match eol */ + YY_RULE_SETUP +-#line 277 "token.l" ++#line 278 "token.l" + { + char *p = yytext; + while (*++p != '"') ; +@@ -1825,7 +1848,7 @@ YY_RULE_SETUP + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 290 "token.l" ++#line 291 "token.l" + { + yylval.val.len = yyleng; + yylval.val.buf = strdup(yytext); +@@ -1836,7 +1859,7 @@ YY_RULE_SETUP + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 298 "token.l" ++#line 299 "token.l" + { + yylval.val.len = yyleng; + yylval.val.buf = strdup(yytext); +@@ -1847,7 +1870,7 @@ YY_RULE_SETUP + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 306 "token.l" ++#line 307 "token.l" + { + yyfatal("Syntax error"); + /*NOTREACHED*/ +@@ -1855,10 +1878,10 @@ YY_RULE_SETUP + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 311 "token.l" ++#line 312 "token.l" + ECHO; + YY_BREAK +-#line 1862 "token.c" ++#line 1885 "token.c" + case YY_STATE_EOF(INITIAL): + case YY_STATE_EOF(S_PL): + case YY_STATE_EOF(S_AUTHALG): +@@ -2411,9 +2434,19 @@ static void yy_load_buffer_state (void) + yyfree((void *) b ); + } + +-#ifndef __cplusplus ++#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */ ++#ifdef __cplusplus ++extern "C" { ++#endif ++#ifdef __THROW /* this is a gnuism */ ++extern int isatty (int ) __THROW; ++#else + extern int isatty (int ); +-#endif /* __cplusplus */ ++#endif ++#ifdef __cplusplus ++} ++#endif ++#endif + + /* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, +@@ -2859,7 +2892,7 @@ void yyfree (void * ptr ) + + #define YYTABLES_NAME "yytables" + +-#line 311 "token.l" ++#line 312 "token.l" + + + diff --git a/package/ipsec-tools/patches/patch-src_setkey_token_l b/package/ipsec-tools/patches/patch-src_setkey_token_l new file mode 100644 index 000000000..e0697835c --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_setkey_token_l @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/setkey/token.l 2007-08-01 13:52:23.000000000 +0200 ++++ ipsec-tools-0.7.2/src/setkey/token.l 2009-05-29 15:25:54.760377400 +0200 +@@ -86,6 +86,7 @@ + #if defined(SADB_X_EALG_AES) && ! defined(SADB_X_EALG_AESCBC) + #define SADB_X_EALG_AESCBC SADB_X_EALG_AES + #endif ++int yywrap(void) { return 1; } + %} + + /* common section */ diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 9c167c60b..ef289ae37 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -22,8 +22,6 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - do-build: ${MAKE} -C ${WRKBUILD}/src \ ${TARGET_CONFIGURE_OPTS} \ diff --git a/package/lame/Makefile b/package/lame/Makefile index f0a17f483..4f18aa165 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -19,16 +19,12 @@ PKGSC_LIBLAME:= libs include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LAME,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBLAME},${PKGSC_LIBLAME})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - -lame-install: +post-install: $(INSTALL_DIR) $(IDIR_LAME)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/lame $(IDIR_LAME)/usr/bin - -liblame-install: + $(INSTALL_BIN) $(WRKINST)/usr/bin/lame $(IDIR_LAME)/usr/bin/ $(INSTALL_DIR) $(IDIR_LIBLAME)/usr/lib $(CP) $(WRKINST)/usr/lib/libmp3lame.so* $(IDIR_LIBLAME)/usr/lib diff --git a/package/libICE/Makefile b/package/libICE/Makefile index eb4cf1740..183543a2c 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -21,8 +21,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBICE_DEV,libice-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBICE_DEV},${PKGSC_LIBICE_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - libice-install: ${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib ${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib diff --git a/package/libXft/Makefile b/package/libXft/Makefile index 89a513cb3..50f3fc68d 100644 --- a/package/libXft/Makefile +++ b/package/libXft/Makefile @@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBXFT_DEV,libxft-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFT_DEV},${PKGSC_LIBXFT_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-malloc0returnsnull \ --disable-install-makestrs diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 325e829ca..559c19521 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-malloc0returnsnull libxt-install: diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index 78e218cd4..aaaf74aff 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBDNET_DEV,libdnet-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDNET_DEV},${PKGSC_LIBDNET_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-check diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 4b6077b5d..43452e092 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -21,8 +21,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - libevent-install: $(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib $(CP) $(WRKINST)/usr/lib/libevent*.so* $(IDIR_LIBEVENT)/usr/lib diff --git a/package/libgcj/Makefile b/package/libgcj/Makefile deleted file mode 100644 index 7be43c3e1..000000000 --- a/package/libgcj/Makefile +++ /dev/null @@ -1,27 +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 -include ${TOPDIR}/toolchain/gcc/Makefile.inc - -PKG_NAME:= libgcj -PKG_DESCR:= GCJ runtime library -PKG_SECTION:= libs - -NO_DISTFILES:= 1 - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBGCJ,libgcj,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -libgcj-install: -ifeq ($(ADK_NATIVE),) - ${INSTALL_DIR} ${IDIR_LIBGCJ}/lib - ${CP} ${STAGING_TARGET_DIR}/lib/libgcj*.so* ${IDIR_LIBGCJ}/lib -endif - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 645cf3338..f27df06c1 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -25,7 +25,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBICONV_DEV,libiconv-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBICONV_DEV},${PKGSC_LIBICONV_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= -fPIC FAKE_FLAGS+= libdir="${WRKINST}/usr/lib" \ includedir="${WRKINST}/usr/include" \ diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 9e6b7663f..7023e0b40 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBNET_DEV,libnet-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNET_DEV},${PKGSC_LIBNET_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) ENDIAN:=lil ifeq (${CPU_ARCH},mips) ENDIAN:=big diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 2deced6df..ed5808ecf 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng -PKG_VERSION:= 1.5.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 220035f111ea045a51e290906025e8b5 +PKG_VERSION:= 1.2.44 +PKG_RELEASE:= 3 +PKG_MD5SUM:= 89b62f8daaeeab1342e307d6d1411ff1 PKG_DESCR:= A library for reading/writing PNG images PKG_SECTION:= libs PKG_DEPENDS:= zlib @@ -27,15 +27,14 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS})) -#TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - libpng-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib libpng-dev-install: - ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPNG_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include/libpng12 + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBPNG_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/libpng12/*.h ${IDIR_LIBPNG_DEV}/usr/include/libpng12 ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig diff --git a/package/libpng/patches/001-apng.patch b/package/libpng/patches/001-apng.patch index 3b68eea9f..3af4a0547 100644 --- a/package/libpng/patches/001-apng.patch +++ b/package/libpng/patches/001-apng.patch @@ -1,7 +1,51 @@ -diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c ---- libpng-1.5.1.orig/pngget.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngget.c 2011-03-27 19:43:38.404620874 +0200 -@@ -937,6 +937,167 @@ +diff -Nur libpng-1.2.44.orig/png.c libpng-1.2.44/png.c +--- libpng-1.2.44.orig/png.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/png.c 2010-07-08 21:21:33.745873377 +0200 +@@ -56,6 +56,11 @@ + PNG_tIME; + PNG_tRNS; + PNG_zTXt; ++#ifdef PNG_APNG_SUPPORTED ++PNG_acTL; ++PNG_fcTL; ++PNG_fdAT; ++#endif + + #ifdef PNG_READ_SUPPORTED + /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ +diff -Nur libpng-1.2.44.orig/pngconf.h libpng-1.2.44/pngconf.h +--- libpng-1.2.44.orig/pngconf.h 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngconf.h 2010-07-08 21:21:33.906029659 +0200 +@@ -951,6 +951,10 @@ + # define PNG_NO_READ_tEXt + # define PNG_NO_READ_zTXt + #endif ++#ifndef PNG_NO_READ_APNG ++# define PNG_READ_APNG_SUPPORTED ++# define PNG_APNG_SUPPORTED ++#endif + #ifndef PNG_NO_READ_bKGD + # define PNG_READ_bKGD_SUPPORTED + # define PNG_bKGD_SUPPORTED +@@ -1177,6 +1181,14 @@ + # define PNG_TEXT_SUPPORTED + # endif + #endif ++#ifndef PNG_NO_WRITE_APNG ++# ifndef PNG_WRITE_APNG_SUPPORTED ++# define PNG_WRITE_APNG_SUPPORTED ++# endif ++# ifndef PNG_APNG_SUPPORTED ++# define PNG_APNG_SUPPORTED ++# endif ++#endif + + #ifdef PNG_WRITE_tIME_SUPPORTED + # ifndef PNG_NO_CONVERT_tIME +diff -Nur libpng-1.2.44.orig/pngget.c libpng-1.2.44/pngget.c +--- libpng-1.2.44.orig/pngget.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngget.c 2010-07-08 21:21:33.676118515 +0200 +@@ -842,6 +842,167 @@ } #endif @@ -11,7 +55,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c + png_uint_32 *num_frames, png_uint_32 *num_plays) +{ + png_debug1(1, "in %s retrieval function", "acTL"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_acTL) && + num_frames != NULL && num_plays != NULL) @@ -20,7 +64,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c + *num_plays = info_ptr->num_plays; + return (1); + } -+ ++ + return (0); +} + @@ -28,7 +72,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_num_frames(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_num_frames()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->num_frames); + return (0); @@ -38,7 +82,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_num_plays(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_num_plays()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->num_plays); + return (0); @@ -52,7 +96,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c + png_byte *dispose_op, png_byte *blend_op) +{ + png_debug1(1, "in %s retrieval function", "fcTL"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_fcTL) && + width != NULL && height != NULL && @@ -70,7 +114,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c + *blend_op = info_ptr->next_frame_blend_op; + return (1); + } -+ ++ + return (0); +} + @@ -78,7 +122,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_width()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_width); + return (0); @@ -88,7 +132,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_height()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_height); + return (0); @@ -98,7 +142,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_x_offset()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_x_offset); + return (0); @@ -108,7 +152,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_y_offset()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_y_offset); + return (0); @@ -118,7 +162,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_delay_num()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_delay_num); + return (0); @@ -128,7 +172,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_delay_den()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_delay_den); + return (0); @@ -138,7 +182,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_dispose_op()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_dispose_op); + return (0); @@ -148,7 +192,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_get_next_frame_blend_op()"); -+ ++ + if (png_ptr != NULL && info_ptr != NULL) + return (info_ptr->next_frame_blend_op); + return (0); @@ -158,32 +202,41 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c +png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr) +{ + png_debug(1, "in png_first_frame_is_hidden()"); -+ ++ + if (png_ptr != NULL) + return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN); -+ ++ + return 0; +} +#endif /* PNG_APNG_SUPPORTED */ + #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED - int PNGAPI - png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr, -diff -Nur libpng-1.5.1.orig/png.h libpng-1.5.1/png.h ---- libpng-1.5.1.orig/png.h 2011-02-03 05:58:16.000000000 +0100 -+++ libpng-1.5.1/png.h 2011-03-27 19:43:38.414620995 +0200 -@@ -404,6 +404,10 @@ - # include "pnglibconf.h" + png_uint_32 PNGAPI + png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr, +diff -Nur libpng-1.2.44.orig/png.h libpng-1.2.44/png.h +--- libpng-1.2.44.orig/png.h 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/png.h 2010-07-08 21:21:33.796029652 +0200 +@@ -1041,6 +1041,19 @@ + png_fixed_point int_y_blue PNG_DEPSTRUCT; #endif -+#define PNG_APNG_SUPPORTED -+#define PNG_READ_APNG_SUPPORTED -+#define PNG_WRITE_APNG_SUPPORTED -+ - #ifndef PNG_VERSION_INFO_ONLY - /* Standard header files (not needed for the version info) */ - # ifdef PNG_SETJMP_SUPPORTED -@@ -766,6 +770,10 @@ ++#ifdef PNG_APNG_SUPPORTED ++ png_uint_32 num_frames; /* including default image */ ++ png_uint_32 num_plays; ++ png_uint_32 next_frame_width; ++ png_uint_32 next_frame_height; ++ png_uint_32 next_frame_x_offset; ++ png_uint_32 next_frame_y_offset; ++ png_uint_16 next_frame_delay_num; ++ png_uint_16 next_frame_delay_den; ++ png_byte next_frame_dispose_op; ++ png_byte next_frame_blend_op; ++#endif ++ + } png_info; + + typedef png_info FAR * png_infop; +@@ -1142,6 +1155,10 @@ #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */ #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ #define PNG_INFO_IDAT 0x8000L /* ESR, 1.0.6 */ @@ -194,149 +247,257 @@ diff -Nur libpng-1.5.1.orig/png.h libpng-1.5.1/png.h /* This is used for the transformation routines, as some of them * change these values for the row. It also should enable using -@@ -811,6 +819,10 @@ - (png_structp, png_infop), ); - typedef PNG_CALLBACK(void, *png_progressive_row_ptr, - (png_structp, png_bytep, png_uint_32, int), ); +@@ -1182,6 +1199,10 @@ + typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop)); + typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep, + png_uint_32, int)); +#ifdef PNG_APNG_SUPPORTED -+typedef PNG_CALLBACK(void, *png_progressive_frame_ptr, (png_structp, -+ png_uint_32),); ++typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp, ++ png_uint_32)); +#endif #endif #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ -@@ -1242,6 +1254,18 @@ - PNG_EXPORT(60, void, png_write_image, - (png_structp png_ptr, png_bytepp image)); +@@ -1527,6 +1548,39 @@ + png_uint_32 user_height_max PNG_DEPSTRUCT; + #endif -+#ifdef PNG_WRITE_APNG_SUPPORTED -+PNG_EXPORT(1001, void, png_write_frame_head, (png_structp png_ptr, -+ png_infop info_ptr, png_bytepp row_pointers, -+ png_uint_32 width, png_uint_32 height, -+ png_uint_32 x_offset, png_uint_32 y_offset, -+ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, -+ png_byte blend_op)); ++#ifdef PNG_APNG_SUPPORTED ++ png_uint_32 apng_flags; ++ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */ ++ png_uint_32 first_frame_width; ++ png_uint_32 first_frame_height; + -+PNG_EXPORT(1002, void, png_write_frame_tail, (png_structp png_ptr, -+ png_infop info_ptr)); ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_uint_32 num_frames_read; /* incremented after all image data of */ ++ /* a frame is read */ ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++ png_progressive_frame_ptr frame_info_fn; /* frame info read callback */ ++ png_progressive_frame_ptr frame_end_fn; /* frame data read callback */ ++#endif +#endif + - /* Write the end of the PNG file. */ - PNG_EXPORT(61, void, png_write_end, - (png_structp png_ptr, png_infop info_ptr)); -@@ -1496,6 +1520,11 @@ - PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structp png_ptr, - png_voidp progressive_ptr, png_progressive_info_ptr info_fn, - png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn)); ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ png_uint_32 num_frames_to_write; ++ png_uint_32 num_frames_written; ++#endif ++ ++/* For png_struct.apng_flags: */ ++#define PNG_FIRST_FRAME_HIDDEN 0x0001 ++ ++/* dispose_op flags from inside fcTL */ ++#define PNG_DISPOSE_OP_NONE 0x00 ++#define PNG_DISPOSE_OP_BACKGROUND 0x01 ++#define PNG_DISPOSE_OP_PREVIOUS 0x02 ++ ++/* blend_op flags from inside fcTL */ ++#define PNG_BLEND_OP_SOURCE 0x00 ++#define PNG_BLEND_OP_OVER 0x01 ++#endif /* PNG_APNG_SUPPORTED */ ++ + /* New member added in libpng-1.0.25 and 1.2.17 */ + #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED + /* Storage for unknown chunk that the library doesn't recognize. */ +@@ -1861,6 +1915,18 @@ + extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr, + png_bytepp image)); + ++#ifdef PNG_WRITE_APNG_SUPPORTED ++extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr, ++ png_infop png_info, png_bytepp row_pointers, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op)); ++ ++extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr, ++ png_infop png_info)); ++#endif ++ + /* Writes the end of the PNG file. */ + extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr, + png_infop info_ptr)); +@@ -2114,6 +2180,11 @@ + png_voidp progressive_ptr, + png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn, + png_progressive_end_ptr end_fn)); +#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXPORT(1003, void, png_set_progressive_frame_fn, (png_structp png_ptr, -+ png_progressive_frame_ptr frame_info_fn, -+ png_progressive_frame_ptr frame_end_fn)); ++extern PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp png_ptr, ++ png_progressive_frame_ptr frame_info_fn, ++ png_progressive_frame_ptr frame_end_fn)); +#endif /* Returns the user pointer associated with the push read functions */ - PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_const_structp png_ptr)); -@@ -1970,6 +1999,62 @@ - int unit, png_const_charp swidth, png_const_charp sheight)); - #endif /* PNG_sCAL_SUPPORTED */ + extern PNG_EXPORT(png_voidp,png_get_progressive_ptr) +@@ -2554,6 +2625,59 @@ + #endif + #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */ +#ifdef PNG_APNG_SUPPORTED -+PNG_EXPORT(1004, png_uint_32, png_get_acTL, (png_structp png_ptr, ++extern PNG_EXPORT(png_uint_32,png_get_acTL) PNGARG((png_structp png_ptr, + png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); -+PNG_EXPORT(1005, png_uint_32, png_set_acTL, (png_structp png_ptr, ++extern PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr, + png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); -+PNG_EXPORT(1006, png_uint_32, png_get_num_frames, (png_structp png_ptr, -+ png_infop info_ptr)); -+PNG_EXPORT(1007, png_uint_32,png_get_num_plays, (png_structp png_ptr, ++extern PNG_EXPORT(png_uint_32,png_get_num_frames) PNGARG((png_structp png_ptr, + png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_num_plays) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); + -+PNG_EXPORT(1008, png_uint_32, png_get_next_frame_fcTL, -+ (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, -+ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL) ++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, ++ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, + png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op, + png_byte *blend_op)); -+PNG_EXPORT(1009, png_uint_32, png_set_next_frame_fcTL, -+ (png_structp png_ptr, png_infop info_ptr, png_uint_32 width, -+ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, ++extern PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL) ++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 width, ++ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, + png_byte blend_op)); -+PNG_EXPORT(1010, png_uint_32, png_get_next_frame_width, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1011, png_uint_32, png_get_next_frame_height, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1012, png_uint_32, png_get_next_frame_x_offset, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1013, png_uint_32, png_get_next_frame_y_offset, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1014, png_uint_16, png_get_next_frame_delay_num, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1015, png_uint_16, png_get_next_frame_delay_den, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1016, png_byte, png_get_next_frame_dispose_op, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1017, png_byte, png_get_next_frame_blend_op, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1018, png_byte, png_get_first_frame_is_hidden, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(1019, png_uint_32, png_set_first_frame_is_hidden, -+ (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); -+ -+/* dispose_op flags from inside fcTL */ -+#define PNG_DISPOSE_OP_NONE 0x00 -+#define PNG_DISPOSE_OP_BACKGROUND 0x01 -+#define PNG_DISPOSE_OP_PREVIOUS 0x02 -+ -+/* blend_op flags from inside fcTL */ -+#define PNG_BLEND_OP_SOURCE 0x00 -+#define PNG_BLEND_OP_OVER 0x01 ++extern PNG_EXPORT(void,png_ensure_fcTL_is_valid) ++ PNGARG((png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_width) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_height) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_x_offset) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_y_offset) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_num) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_den) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_byte,png_get_next_frame_dispose_op) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_byte,png_get_next_frame_blend_op) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_byte,png_get_first_frame_is_hidden) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_set_first_frame_is_hidden) ++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); +#endif /* PNG_APNG_SUPPORTED */ + +#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXPORT(1020, void, png_read_frame_head, (png_structp png_ptr, ++extern PNG_EXPORT(void,png_read_frame_head) PNGARG((png_structp png_ptr, + png_infop info_ptr)); +#endif + #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED /* Provide a list of chunks and how they are to be handled, if the built-in handling or default unknown chunk handling is not desired. Any chunks not -diff -Nur libpng-1.5.1.orig/pnginfo.h libpng-1.5.1/pnginfo.h ---- libpng-1.5.1.orig/pnginfo.h 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pnginfo.h 2011-03-27 19:43:38.543370848 +0200 -@@ -266,5 +266,18 @@ - png_bytepp row_pointers; /* the image bits */ - #endif +@@ -2918,6 +3042,10 @@ + #define PNG_BACKGROUND_IS_GRAY 0x800 + #define PNG_HAVE_PNG_SIGNATURE 0x1000 + #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ ++#ifdef PNG_APNG_SUPPORTED ++#define PNG_HAVE_acTL 0x4000 ++#define PNG_HAVE_fcTL 0x8000L ++#endif + /* Flags for the transformations the PNG library does on the image data */ + #define PNG_BGR 0x0001 +@@ -3060,6 +3188,11 @@ + #define PNG_tIME png_byte png_tIME[5] = {116, 73, 77, 69, '\0'} + #define PNG_tRNS png_byte png_tRNS[5] = {116, 82, 78, 83, '\0'} + #define PNG_zTXt png_byte png_zTXt[5] = {122, 84, 88, 116, '\0'} +#ifdef PNG_APNG_SUPPORTED -+ png_uint_32 num_frames; /* including default image */ -+ png_uint_32 num_plays; -+ png_uint_32 next_frame_width; -+ png_uint_32 next_frame_height; -+ png_uint_32 next_frame_x_offset; -+ png_uint_32 next_frame_y_offset; -+ png_uint_16 next_frame_delay_num; -+ png_uint_16 next_frame_delay_den; -+ png_byte next_frame_dispose_op; -+ png_byte next_frame_blend_op; ++#define PNG_acTL png_byte png_acTL[5] = { 97, 99, 84, 76, '\0'} ++#define PNG_fcTL png_byte png_fcTL[5] = {102, 99, 84, 76, '\0'} ++#define PNG_fdAT png_byte png_fdAT[5] = {102, 100, 65, 84, '\0'} ++#endif + + #ifdef PNG_USE_GLOBAL_ARRAYS + PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5]; +@@ -3083,6 +3216,11 @@ + PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5]; + PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5]; + PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5]; ++#ifdef PNG_APNG_SUPPORTED ++PNG_EXPORT_VAR (png_byte FARDATA) png_acTL[5]; ++PNG_EXPORT_VAR (png_byte FARDATA) png_fcTL[5]; ++PNG_EXPORT_VAR (png_byte FARDATA) png_fdAT[5]; +#endif + #endif /* PNG_USE_GLOBAL_ARRAYS */ + + #if defined(PNG_1_0_X) || defined (PNG_1_2_X) +@@ -3365,6 +3503,17 @@ + #endif + #endif + ++#ifdef PNG_WRITE_APNG_SUPPORTED ++PNG_EXTERN void png_write_acTL PNGARG((png_structp png_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays)); + - }; - #endif /* PNGINFO_H */ -diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c ---- libpng-1.5.1.orig/pngpread.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngpread.c 2011-03-27 19:43:38.673370990 +0200 -@@ -263,6 +263,11 @@ ++PNG_EXTERN void png_write_fcTL PNGARG((png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op)); ++#endif ++ + /* Called when finished processing a row of data */ + PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr)) PNG_PRIVATE; + +@@ -3417,6 +3566,20 @@ + PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr, + png_infop info_ptr)) PNG_PRIVATE; + ++#ifdef PNG_READ_APNG_SUPPORTED ++/* Private, reset some things to become ready for reading next frame */ ++PNG_EXTERN void png_read_reset PNGARG((png_structp png_ptr)); ++PNG_EXTERN void png_read_reinit PNGARG((png_structp png_ptr, ++ png_infop info_ptr)); ++PNG_EXTERN void png_progressive_read_reset PNGARG((png_structp png_ptr)); ++#endif ++#ifdef PNG_WRITE_APNG_SUPPORTED ++/* Private, reset some things to become ready for writing next frame */ ++PNG_EXTERN void png_write_reset PNGARG((png_structp png_ptr)); ++PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 width, png_uint_32 height)); ++#endif ++ + /* These are the functions that do the transformations */ + #ifdef PNG_READ_FILLER_SUPPORTED + PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info, +@@ -3640,6 +3803,18 @@ + png_uint_32 length)) PNG_PRIVATE; + #endif + ++#ifdef PNG_READ_APNG_SUPPORTED ++PNG_EXTERN void png_handle_acTL PNGARG((png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length)); ++PNG_EXTERN void png_handle_fcTL PNGARG((png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length)); ++PNG_EXTERN void png_have_info PNGARG((png_structp png_ptr, png_infop info_ptr)); ++PNG_EXTERN void png_handle_fdAT PNGARG((png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length)); ++PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr, ++ png_uint_32 length)); ++#endif ++ + PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr, + png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE; + +diff -Nur libpng-1.2.44.orig/pngpread.c libpng-1.2.44/pngpread.c +--- libpng-1.2.44.orig/pngpread.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngpread.c 2010-07-08 21:21:33.947205863 +0200 +@@ -206,6 +206,11 @@ #ifdef PNG_READ_zTXt_SUPPORTED - PNG_zTXt; + PNG_CONST PNG_zTXt; #endif +#ifdef PNG_READ_APNG_SUPPORTED -+ PNG_acTL; -+ PNG_fcTL; -+ PNG_fdAT; ++ PNG_CONST PNG_acTL; ++ PNG_CONST PNG_fcTL; ++ PNG_CONST PNG_fdAT; +#endif + #endif /* PNG_USE_LOCAL_ARRAYS */ /* First we make sure we have enough data for the 4 byte chunk name - * and the 4 byte chunk length before proceeding with decoding the -@@ -288,6 +293,103 @@ +@@ -232,6 +237,103 @@ png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; } @@ -349,7 +510,7 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c + /* Discard trailing IDATs for the first frame */ + if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1) + png_error(png_ptr, "out of place IDAT"); -+ ++ + if (png_ptr->push_length + 4 > png_ptr->buffer_size) + { + png_push_save_buffer(png_ptr); @@ -367,13 +528,13 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c + return; + } + png_ensure_sequence_number(png_ptr, 4); -+ ++ + if (!(png_ptr->mode & PNG_HAVE_fcTL)) + { + /* Discard trailing fdATs for frames other than the first */ + if (png_ptr->num_frames_read < 2) + png_error(png_ptr, "out of place fdAT"); -+ ++ + if (png_ptr->push_length + 4 > png_ptr->buffer_size) + { + png_push_save_buffer(png_ptr); @@ -389,7 +550,7 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c + png_ptr->idat_size = png_ptr->push_length - 4; + png_ptr->mode |= PNG_HAVE_IDAT; + png_ptr->process_mode = PNG_READ_IDAT_MODE; -+ ++ + return; + } + } @@ -400,23 +561,23 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c + png_push_save_buffer(png_ptr); + return; + } -+ ++ + png_read_reset(png_ptr); + png_ptr->mode &= ~PNG_HAVE_fcTL; -+ ++ + png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); -+ ++ + if (!(png_ptr->mode & PNG_HAVE_fcTL)) + png_error(png_ptr, "missing required fcTL chunk"); -+ ++ + png_read_reinit(png_ptr, info_ptr); + png_progressive_read_reset(png_ptr); -+ ++ + if (png_ptr->frame_info_fn != NULL) + (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read); -+ ++ + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; -+ ++ + return; + } + else @@ -432,16 +593,16 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; + return; + } -+ ++ + return; + } +#endif /* PNG_READ_APNG_SUPPORTED */ + if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) - if (png_ptr->mode & PNG_AFTER_IDAT) - png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT; -@@ -383,6 +485,9 @@ - png_benign_error(png_ptr, "Too many IDATs found"); + if (png_ptr->mode & PNG_AFTER_IDAT) + png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT; +@@ -327,6 +429,9 @@ + png_error(png_ptr, "Too many IDAT's found"); } +#ifdef PNG_READ_APNG_SUPPORTED @@ -450,7 +611,7 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c png_ptr->idat_size = png_ptr->push_length; png_ptr->mode |= PNG_HAVE_IDAT; png_ptr->process_mode = PNG_READ_IDAT_MODE; -@@ -615,6 +720,38 @@ +@@ -559,6 +664,38 @@ } #endif @@ -489,14 +650,17 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c else { if (png_ptr->push_length + 4 > png_ptr->buffer_size) -@@ -810,11 +947,15 @@ +@@ -738,13 +875,17 @@ png_push_read_IDAT(png_structp png_ptr) { - PNG_IDAT; + #ifdef PNG_USE_LOCAL_ARRAYS +- PNG_CONST PNG_IDAT; ++ PNG_IDAT; +#ifdef PNG_READ_APNG_SUPPORTED + PNG_fdAT; + PNG_IEND; +#endif + #endif if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER)) { png_byte chunk_length[4]; @@ -506,13 +670,13 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c { png_push_save_buffer(png_ptr); return; -@@ -826,17 +967,64 @@ +@@ -756,15 +897,62 @@ png_crc_read(png_ptr, png_ptr->chunk_name, 4); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; - if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) +#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_memcmp(png_ptr->chunk_name, png_fdAT, 4) ++ if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_fdAT, 4) + && png_ptr->num_frames_read > 0) + { + if (png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) @@ -548,10 +712,8 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c + ) { png_ptr->process_mode = PNG_READ_CHUNK_MODE; - if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)) png_error(png_ptr, "Not enough compressed data"); - +#ifdef PNG_READ_APNG_SUPPORTED + if (png_ptr->frame_end_fn != NULL) + (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); @@ -572,7 +734,7 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c } if (png_ptr->idat_size && png_ptr->save_buffer_size) { -@@ -1843,6 +2031,17 @@ +@@ -1763,6 +1951,17 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -588,119 +750,25 @@ diff -Nur libpng-1.5.1.orig/pngpread.c libpng-1.5.1/pngpread.c +#endif + png_voidp PNGAPI - png_get_progressive_ptr(png_const_structp png_ptr) + png_get_progressive_ptr(png_structp png_ptr) { -diff -Nur libpng-1.5.1.orig/pngpriv.h libpng-1.5.1/pngpriv.h ---- libpng-1.5.1.orig/pngpriv.h 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngpriv.h 2011-03-27 19:43:38.503370856 +0200 -@@ -275,6 +275,10 @@ - #define PNG_BACKGROUND_IS_GRAY 0x800 - #define PNG_HAVE_PNG_SIGNATURE 0x1000 - #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ -+#ifdef PNG_APNG_SUPPORTED -+#define PNG_HAVE_acTL 0x4000 -+#define PNG_HAVE_fcTL 0x8000L -+#endif - - /* Flags for the transformations the PNG library does on the image data */ - #define PNG_BGR 0x0001 -@@ -457,6 +461,14 @@ - #define PNG_tIME PNG_CONST png_byte png_tIME[5] = {116, 73, 77, 69, '\0'} - #define PNG_tRNS PNG_CONST png_byte png_tRNS[5] = {116, 82, 78, 83, '\0'} - #define PNG_zTXt PNG_CONST png_byte png_zTXt[5] = {122, 84, 88, 116, '\0'} -+#ifdef PNG_APNG_SUPPORTED -+#define PNG_acTL PNG_CONST png_byte png_acTL[5] = { 97, 99, 84, 76, '\0'} -+#define PNG_fcTL PNG_CONST png_byte png_fcTL[5] = {102, 99, 84, 76, '\0'} -+#define PNG_fdAT PNG_CONST png_byte png_fdAT[5] = {102, 100, 65, 84, '\0'} -+ -+/* For png_struct.apng_flags: */ -+#define PNG_FIRST_FRAME_HIDDEN 0x0001 -+#endif - - - /* Inhibit C++ name-mangling for libpng functions but not for system calls. */ -@@ -696,6 +708,17 @@ - int unit, png_const_charp width, png_const_charp height)); - #endif - -+#ifdef PNG_WRITE_APNG_SUPPORTED -+PNG_EXTERN void png_write_acTL PNGARG((png_structp png_ptr, -+ png_uint_32 num_frames, png_uint_32 num_plays)); -+ -+PNG_EXTERN void png_write_fcTL PNGARG((png_structp png_ptr, -+ png_uint_32 width, png_uint_32 height, -+ png_uint_32 x_offset, png_uint_32 y_offset, -+ png_uint_16 delay_num, png_uint_16 delay_den, -+ png_byte dispose_op, png_byte blend_op)); -+#endif -+ - /* Called when finished processing a row of data */ - PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr)); - -@@ -744,6 +767,20 @@ - PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr, - png_infop info_ptr)); - -+#ifdef PNG_READ_APNG_SUPPORTED -+/* Private, reset some things to become ready for reading next frame */ -+PNG_EXTERN void png_read_reset PNGARG((png_structp png_ptr)); -+PNG_EXTERN void png_read_reinit PNGARG((png_structp png_ptr, -+ png_infop info_ptr)); -+PNG_EXTERN void png_progressive_read_reset PNGARG((png_structp png_ptr)); -+#endif -+#ifdef PNG_WRITE_APNG_SUPPORTED -+/* Private, reset some things to become ready for writing next frame */ -+PNG_EXTERN void png_write_reset PNGARG((png_structp png_ptr)); -+PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr, -+ png_infop info_ptr, png_uint_32 width, png_uint_32 height)); -+#endif -+ - /* These are the functions that do the transformations */ - #ifdef PNG_READ_FILLER_SUPPORTED - PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info, -@@ -972,6 +1009,25 @@ - png_uint_32 length)); - #endif - -+#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXTERN void png_handle_acTL PNGARG((png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length)); -+PNG_EXTERN void png_handle_fcTL PNGARG((png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length)); -+PNG_EXTERN void png_have_info PNGARG((png_structp png_ptr, png_infop info_ptr)); -+PNG_EXTERN void png_handle_fdAT PNGARG((png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length)); -+PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr, -+ png_uint_32 length)); -+#endif -+#ifdef PNG_APNG_SUPPORTED -+PNG_EXTERN void png_ensure_fcTL_is_valid PNGARG((png_structp png_ptr, -+ png_uint_32 width, png_uint_32 height, -+ png_uint_32 x_offset, png_uint_32 y_offset, -+ png_uint_16 delay_num, png_uint_16 delay_den, -+ png_byte dispose_op, png_byte blend_op)); -+#endif -+ - PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr, - png_infop info_ptr, png_uint_32 length)); - -diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c ---- libpng-1.5.1.orig/pngread.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngread.c 2011-03-27 19:43:38.383370613 +0200 -@@ -292,6 +292,11 @@ +diff -Nur libpng-1.2.44.orig/pngread.c libpng-1.2.44/pngread.c +--- libpng-1.2.44.orig/pngread.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngread.c 2010-07-08 21:21:33.676118515 +0200 +@@ -437,6 +437,11 @@ #ifdef PNG_READ_zTXt_SUPPORTED - PNG_zTXt; + PNG_CONST PNG_zTXt; #endif +#ifdef PNG_READ_APNG_SUPPORTED -+ PNG_acTL; -+ PNG_fcTL; -+ PNG_fdAT; ++ PNG_CONST PNG_acTL; ++ PNG_CONST PNG_fcTL; ++ PNG_CONST PNG_fdAT; +#endif + #endif /* PNG_USE_LOCAL_ARRAYS */ png_uint_32 length = png_read_chunk_header(png_ptr); PNG_CONST png_bytep chunk_name = png_ptr->chunk_name; - -@@ -344,6 +349,9 @@ - !(png_ptr->mode & PNG_HAVE_PLTE)) +@@ -481,6 +486,9 @@ + !(png_ptr->mode & PNG_HAVE_PLTE)) png_error(png_ptr, "Missing PLTE before IDAT"); +#ifdef PNG_READ_APNG_SUPPORTED @@ -709,10 +777,10 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c png_ptr->idat_size = length; png_ptr->mode |= PNG_HAVE_IDAT; break; -@@ -434,12 +442,96 @@ +@@ -553,12 +561,97 @@ + else if (!png_memcmp(chunk_name, png_iTXt, 4)) png_handle_iTXt(png_ptr, info_ptr, length); #endif - +#ifdef PNG_READ_APNG_SUPPORTED + else if (!png_memcmp(chunk_name, png_acTL, 4)) + png_handle_acTL(png_ptr, info_ptr, length); @@ -721,7 +789,6 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c + else if (!png_memcmp(chunk_name, png_fdAT, 4)) + png_handle_fdAT(png_ptr, info_ptr, length); +#endif -+ else png_handle_unknown(png_ptr, info_ptr, length); } @@ -733,37 +800,39 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c +png_read_frame_head(png_structp png_ptr, png_infop info_ptr) +{ + png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */ -+ ++ + png_debug(0, "Reading frame head"); -+ ++ + if (!(png_ptr->mode & PNG_HAVE_acTL)) + png_error(png_ptr, "attempt to png_read_frame_head() but " + "no acTL present"); -+ ++ + /* do nothing for the main IDAT */ + if (png_ptr->num_frames_read == 0) + return; -+ ++ + png_crc_finish(png_ptr, 0); /* CRC from last IDAT or fdAT chunk */ -+ ++ + png_read_reset(png_ptr); + png_ptr->mode &= ~PNG_HAVE_fcTL; -+ ++ + have_chunk_after_DAT = 0; + for (;;) + { ++#ifdef PNG_USE_LOCAL_ARRAYS + PNG_IDAT; + PNG_fdAT; + PNG_fcTL; ++#endif + png_byte chunk_length[4]; + png_uint_32 length; -+ ++ + png_read_data(png_ptr, chunk_length, 4); + length = png_get_uint_31(png_ptr, chunk_length); -+ ++ + png_reset_crc(png_ptr); + png_crc_read(png_ptr, png_ptr->chunk_name, 4); -+ ++ + if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) + { + /* discard trailing IDATs for the first frame */ @@ -779,7 +848,7 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c + else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4)) + { + png_ensure_sequence_number(png_ptr, length); -+ ++ + /* discard trailing fdATs for frames other than the first */ + if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1) + png_crc_finish(png_ptr, length - 4); @@ -787,7 +856,7 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c + { + png_ptr->idat_size = length - 4; + png_ptr->mode |= PNG_HAVE_IDAT; -+ ++ + break; + } + else @@ -806,18 +875,18 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c /* Optional call to update the users info_ptr structure */ void PNGAPI png_read_update_info(png_structp png_ptr, png_infop info_ptr) -@@ -488,6 +580,10 @@ +@@ -599,6 +692,10 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) { - PNG_IDAT; + PNG_CONST PNG_IDAT; +#ifdef PNG_READ_APNG_SUPPORTED -+ PNG_fdAT; -+ PNG_IEND; ++ PNG_CONST PNG_fdAT; ++ PNG_CONST PNG_IEND; +#endif PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, - 0xff}; + 0xff}; PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}; -@@ -642,13 +738,39 @@ +@@ -734,13 +831,39 @@ { if (!(png_ptr->zstream.avail_in)) { @@ -850,17 +919,17 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c + bytes_to_skip = png_ptr->idat_size; + continue; + } -+ ++ + png_ensure_sequence_number(png_ptr, png_ptr->idat_size); -+ ++ + png_ptr->idat_size -= 4; + } +#endif } png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size; png_ptr->zstream.next_in = png_ptr->zbuf; -@@ -668,6 +790,9 @@ - png_benign_error(png_ptr, "Extra compressed data"); +@@ -758,6 +881,9 @@ + png_error(png_ptr, "Extra compressed data"); png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED; +#ifdef PNG_READ_APNG_SUPPORTED @@ -868,23 +937,23 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c +#endif break; } - -@@ -952,6 +1077,11 @@ + if (ret != Z_OK) +@@ -1015,6 +1141,11 @@ #ifdef PNG_READ_zTXt_SUPPORTED - PNG_zTXt; + PNG_CONST PNG_zTXt; #endif +#ifdef PNG_READ_APNG_SUPPORTED -+ PNG_acTL; -+ PNG_fcTL; -+ PNG_fdAT; ++ PNG_CONST PNG_acTL; ++ PNG_CONST PNG_fcTL; ++ PNG_CONST PNG_fdAT; +#endif + #endif /* PNG_USE_LOCAL_ARRAYS */ png_uint_32 length = png_read_chunk_header(png_ptr); PNG_CONST png_bytep chunk_name = png_ptr->chunk_name; - -@@ -1073,6 +1203,15 @@ +@@ -1115,6 +1246,14 @@ + else if (!png_memcmp(chunk_name, png_iTXt, 4)) png_handle_iTXt(png_ptr, info_ptr, length); #endif - +#ifdef PNG_READ_APNG_SUPPORTED + else if (!png_memcmp(chunk_name, png_acTL, 4)) + png_handle_acTL(png_ptr, info_ptr, length); @@ -893,14 +962,13 @@ diff -Nur libpng-1.5.1.orig/pngread.c libpng-1.5.1/pngread.c + else if (!png_memcmp(chunk_name, png_fdAT, 4)) + png_handle_fdAT(png_ptr, info_ptr, length); +#endif -+ else png_handle_unknown(png_ptr, info_ptr, length); } while (!(png_ptr->mode & PNG_HAVE_IEND)); -diff -Nur libpng-1.5.1.orig/pngrtran.c libpng-1.5.1/pngrtran.c ---- libpng-1.5.1.orig/pngrtran.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngrtran.c 2011-03-27 19:43:38.813371313 +0200 -@@ -1425,7 +1425,7 @@ +diff -Nur libpng-1.2.44.orig/pngrtran.c libpng-1.2.44/pngrtran.c +--- libpng-1.2.44.orig/pngrtran.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngrtran.c 2010-07-08 21:21:34.149609181 +0200 +@@ -1352,7 +1352,7 @@ * pixels. This check added to libpng-1.2.19 */ #if (PNG_WARN_UNINITIALIZED_ROW==1) @@ -909,10 +977,10 @@ diff -Nur libpng-1.5.1.orig/pngrtran.c libpng-1.5.1/pngrtran.c #else png_warning(png_ptr, "Uninitialized row"); #endif -diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c ---- libpng-1.5.1.orig/pngrutil.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngrutil.c 2011-03-27 19:43:38.743371274 +0200 -@@ -569,6 +569,11 @@ +diff -Nur libpng-1.2.44.orig/pngrutil.c libpng-1.2.44/pngrutil.c +--- libpng-1.2.44.orig/pngrutil.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngrutil.c 2010-07-08 21:21:34.045873588 +0200 +@@ -460,6 +460,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -924,7 +992,7 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2492,6 +2497,172 @@ +@@ -2348,6 +2353,172 @@ } #endif @@ -936,7 +1004,7 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c + png_uint_32 num_frames; + png_uint_32 num_plays; + png_uint_32 didSet; -+ ++ + png_debug(1, "in png_handle_acTL"); + + if (!(png_ptr->mode & PNG_HAVE_IHDR)) @@ -961,13 +1029,13 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c + png_crc_finish(png_ptr, length); + return; + } -+ ++ + png_crc_read(png_ptr, data, 8); + png_crc_finish(png_ptr, 0); -+ ++ + num_frames = png_get_uint_31(png_ptr, data); + num_plays = png_get_uint_31(png_ptr, data + 4); -+ ++ + /* the set function will do error checking on num_frames */ + didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays); + if(didSet) @@ -1064,7 +1132,7 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c +png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) +{ + png_ensure_sequence_number(png_ptr, length); -+ ++ + /* This function is only called from png_read_end(), png_read_info(), + * and png_push_read_chunk() which means that: + * - the user doesn't want to read this frame @@ -1079,25 +1147,25 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c +{ + png_byte data[4]; + png_uint_32 sequence_number; -+ ++ + if (length < 4) + png_error(png_ptr, "invalid fcTL or fdAT chunk found"); -+ ++ + png_crc_read(png_ptr, data, 4); + sequence_number = png_get_uint_31(png_ptr, data); -+ ++ + if (sequence_number != png_ptr->next_seq_num) + png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence " + "number found"); -+ ++ + png_ptr->next_seq_num++; +} +#endif /* PNG_READ_APNG_SUPPORTED */ + /* This function is called when we haven't found a handler for a - * chunk. If there isn't a problem with the chunk itself (ie bad - * chunk name, CRC, or a critical chunk), the chunk is silently ignored -@@ -3613,4 +3784,73 @@ + chunk. If there isn't a problem with the chunk itself (ie bad + chunk name, CRC, or a critical chunk), the chunk is silently ignored +@@ -3379,4 +3550,75 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1123,13 +1191,14 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c + png_ptr->height = info_ptr->next_frame_height; + png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width); + if (png_ptr->prev_row) -+ png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); ++ png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1); +} + +/* same as png_read_reset() but for the progressive reader */ +void /* PRIVATE */ +png_progressive_read_reset(png_structp png_ptr) +{ ++#ifdef PNG_USE_LOCAL_ARRAYS + /* start of interlace block */ + const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; + @@ -1141,7 +1210,8 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c + + /* offset to next interlace block in the y direction */ + const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; -+ ++#endif ++ + if (png_ptr->interlaced) + { + if (!(png_ptr->transformations & PNG_INTERLACE)) @@ -1171,11 +1241,11 @@ diff -Nur libpng-1.5.1.orig/pngrutil.c libpng-1.5.1/pngrutil.c +} +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED */ -diff -Nur libpng-1.5.1.orig/pngset.c libpng-1.5.1/pngset.c ---- libpng-1.5.1.orig/pngset.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngset.c 2011-03-27 19:43:38.733370835 +0200 -@@ -211,6 +211,11 @@ - info_ptr->rowbytes = 0; +diff -Nur libpng-1.2.44.orig/pngset.c libpng-1.2.44/pngset.c +--- libpng-1.2.44.orig/pngset.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngset.c 2010-07-08 21:21:33.996027603 +0200 +@@ -266,6 +266,11 @@ + info_ptr->rowbytes = (png_size_t)0; else info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width); + @@ -1186,7 +1256,7 @@ diff -Nur libpng-1.5.1.orig/pngset.c libpng-1.5.1/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -954,6 +959,142 @@ +@@ -960,6 +965,142 @@ } #endif /* PNG_sPLT_SUPPORTED */ @@ -1223,12 +1293,12 @@ diff -Nur libpng-1.5.1.orig/pngset.c libpng-1.5.1/pngset.c + "> 2^31-1"); + return (0); + } -+ ++ + info_ptr->num_frames = num_frames; + info_ptr->num_plays = num_plays; -+ ++ + info_ptr->valid |= PNG_INFO_acTL; -+ ++ + return (1); +} + @@ -1249,10 +1319,10 @@ diff -Nur libpng-1.5.1.orig/pngset.c libpng-1.5.1/pngset.c + "ignored"); + return (0); + } -+ ++ + png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, + delay_num, delay_den, dispose_op, blend_op); -+ ++ + if (blend_op == PNG_BLEND_OP_OVER) + { + if (!(png_ptr->color_type & PNG_COLOR_MASK_ALPHA) && @@ -1272,13 +1342,13 @@ diff -Nur libpng-1.5.1.orig/pngset.c libpng-1.5.1/pngset.c + info_ptr->next_frame_delay_den = delay_den; + info_ptr->next_frame_dispose_op = dispose_op; + info_ptr->next_frame_blend_op = blend_op; -+ ++ + info_ptr->valid |= PNG_INFO_fcTL; -+ ++ + return (1); +} + -+void /* PRIVATE */ ++void PNGAPI +png_ensure_fcTL_is_valid(png_structp png_ptr, + png_uint_32 width, png_uint_32 height, + png_uint_32 x_offset, png_uint_32 y_offset, @@ -1313,15 +1383,15 @@ diff -Nur libpng-1.5.1.orig/pngset.c libpng-1.5.1/pngset.c + png_byte is_hidden) +{ + png_debug(1, "in png_first_frame_is_hidden()"); -+ ++ + if (png_ptr == NULL) + return 0; -+ ++ + if(is_hidden) + png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; + else + png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN; -+ ++ + return 1; +} +#endif /* PNG_APNG_SUPPORTED */ @@ -1329,41 +1399,10 @@ diff -Nur libpng-1.5.1.orig/pngset.c libpng-1.5.1/pngset.c #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED void PNGAPI png_set_unknown_chunks(png_structp png_ptr, -diff -Nur libpng-1.5.1.orig/pngstruct.h libpng-1.5.1/pngstruct.h ---- libpng-1.5.1.orig/pngstruct.h 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngstruct.h 2011-03-27 19:43:38.603370828 +0200 -@@ -287,6 +287,27 @@ - png_alloc_size_t user_chunk_malloc_max; - #endif - -+#ifdef PNG_APNG_SUPPORTED -+ png_uint_32 apng_flags; -+ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */ -+ png_uint_32 first_frame_width; -+ png_uint_32 first_frame_height; -+ -+#ifdef PNG_READ_APNG_SUPPORTED -+ png_uint_32 num_frames_read; /* incremented after all image data of */ -+ /* a frame is read */ -+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+ png_progressive_frame_ptr frame_info_fn; /* frame info read callback */ -+ png_progressive_frame_ptr frame_end_fn; /* frame data read callback */ -+#endif -+#endif -+ -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ png_uint_32 num_frames_to_write; -+ png_uint_32 num_frames_written; -+#endif -+#endif /* PNG_APNG_SUPPORTED */ -+ - /* New member added in libpng-1.0.25 and 1.2.17 */ - #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED - /* Storage for unknown chunk that the library doesn't recognize. */ -diff -Nur libpng-1.5.1.orig/pngwrite.c libpng-1.5.1/pngwrite.c ---- libpng-1.5.1.orig/pngwrite.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngwrite.c 2011-03-27 19:43:38.643370780 +0200 -@@ -58,6 +58,10 @@ +diff -Nur libpng-1.2.44.orig/pngwrite.c libpng-1.2.44/pngwrite.c +--- libpng-1.2.44.orig/pngwrite.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngwrite.c 2010-07-08 21:21:33.847089331 +0200 +@@ -57,6 +57,10 @@ /* The rest of these check to see if the valid field has the appropriate * flag set, and if it does, writes the chunk. */ @@ -1373,9 +1412,9 @@ diff -Nur libpng-1.5.1.orig/pngwrite.c libpng-1.5.1/pngwrite.c +#endif #ifdef PNG_WRITE_gAMA_SUPPORTED if (info_ptr->valid & PNG_INFO_gAMA) - png_write_gAMA_fixed(png_ptr, info_ptr->gamma); -@@ -300,6 +304,10 @@ - + { +@@ -319,6 +323,10 @@ + return; if (!(png_ptr->mode & PNG_HAVE_IDAT)) png_error(png_ptr, "No IDATs written into file"); +#ifdef PNG_WRITE_APNG_SUPPORTED @@ -1385,8 +1424,8 @@ diff -Nur libpng-1.5.1.orig/pngwrite.c libpng-1.5.1/pngwrite.c /* See if user wants us to write information chunks */ if (info_ptr != NULL) -@@ -1602,4 +1610,39 @@ - PNG_UNUSED(params) +@@ -1589,4 +1597,39 @@ + params = params; } #endif + @@ -1399,16 +1438,16 @@ diff -Nur libpng-1.5.1.orig/pngwrite.c libpng-1.5.1/pngwrite.c + png_byte blend_op) +{ + png_debug(1, "in png_write_frame_head"); -+ ++ + /* there is a chance this has been set after png_write_info was called, + * so it would be set but not written. is there a way to be sure? */ + if (!(info_ptr->valid & PNG_INFO_acTL)) + png_error(png_ptr, "png_write_frame_head(): acTL not set"); -+ ++ + png_write_reset(png_ptr); -+ ++ + png_write_reinit(png_ptr, info_ptr, width, height); -+ ++ + if ( !(png_ptr->num_frames_written == 0 && + (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) ) + png_write_fcTL(png_ptr, width, height, x_offset, y_offset, @@ -1416,21 +1455,21 @@ diff -Nur libpng-1.5.1.orig/pngwrite.c libpng-1.5.1/pngwrite.c +} + +void PNGAPI -+png_write_frame_tail(png_structp png_ptr, png_infop info_ptr) ++png_write_frame_tail(png_structp png_ptr, png_infop png_info) +{ + png_debug(1, "in png_write_frame_tail"); -+ ++ + png_ptr->num_frames_written++; +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ + #endif /* PNG_WRITE_SUPPORTED */ -diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c ---- libpng-1.5.1.orig/pngwutil.c 2011-02-03 05:58:17.000000000 +0100 -+++ libpng-1.5.1/pngwutil.c 2011-03-27 19:43:38.803370805 +0200 -@@ -596,6 +596,11 @@ +diff -Nur libpng-1.2.44.orig/pngwutil.c libpng-1.2.44/pngwutil.c +--- libpng-1.2.44.orig/pngwutil.c 2010-06-26 02:31:14.000000000 +0200 ++++ libpng-1.2.44/pngwutil.c 2010-07-08 21:21:34.095873630 +0200 +@@ -516,6 +516,11 @@ /* Write the chunk */ - png_write_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); + png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13); +#ifdef PNG_WRITE_APNG_SUPPORTED + png_ptr->first_frame_width = width; @@ -1440,38 +1479,38 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c /* Initialize zlib with PNG info */ png_ptr->zstream.zalloc = png_zalloc; png_ptr->zstream.zfree = png_zfree; -@@ -742,6 +747,9 @@ - png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length) +@@ -641,6 +646,9 @@ { + #ifdef PNG_USE_LOCAL_ARRAYS PNG_IDAT; +#ifdef PNG_WRITE_APNG_SUPPORTED + PNG_fdAT; +#endif + #endif png_debug(1, "in png_write_IDAT"); - -@@ -791,7 +799,28 @@ - "Invalid zlib compression method or flags in IDAT"); +@@ -686,7 +694,28 @@ + "Invalid zlib compression method or flags in IDAT"); } +#ifdef PNG_WRITE_APNG_SUPPORTED + if(png_ptr->num_frames_written == 0) +#endif - png_write_chunk(png_ptr, png_IDAT, data, length); + png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length); +#ifdef PNG_WRITE_APNG_SUPPORTED + else + { + png_byte buf[4]; -+ -+ png_write_chunk_start(png_ptr, png_fdAT, 4 + length); -+ ++ ++ png_write_chunk_start(png_ptr, (png_bytep)png_fdAT, 4 + length); ++ + png_save_uint_32(buf, png_ptr->next_seq_num); + png_write_chunk_data(png_ptr, buf, 4); -+ ++ + png_write_chunk_data(png_ptr, data, length); -+ ++ + png_write_chunk_end(png_ptr); -+ ++ + png_ptr->next_seq_num++; + } +#endif @@ -1479,7 +1518,7 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c png_ptr->mode |= PNG_HAVE_IDAT; } -@@ -1769,6 +1798,66 @@ +@@ -1754,6 +1783,70 @@ } #endif @@ -1488,20 +1527,22 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c +png_write_acTL(png_structp png_ptr, + png_uint_32 num_frames, png_uint_32 num_plays) +{ ++#ifdef PNG_USE_LOCAL_ARRAYS + PNG_acTL; ++#endif + png_byte data[16]; -+ ++ + png_debug(1, "in png_write_acTL"); -+ ++ + png_ptr->num_frames_to_write = num_frames; -+ ++ + if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) + num_frames--; -+ ++ + png_save_uint_32(data, num_frames); + png_save_uint_32(data + 4, num_plays); -+ -+ png_write_chunk(png_ptr, png_acTL, data, (png_size_t)8); ++ ++ png_write_chunk(png_ptr, (png_bytep)png_acTL, data, (png_size_t)8); +} + +void /* PRIVATE */ @@ -1510,11 +1551,13 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, + png_byte blend_op) +{ ++#ifdef PNG_USE_LOCAL_ARRAYS + PNG_fcTL; ++#endif + png_byte data[26]; -+ ++ + png_debug(1, "in png_write_fcTL"); -+ ++ + if (png_ptr->num_frames_written == 0 && (x_offset != 0 || y_offset != 0)) + png_error(png_ptr, "x and/or y offset for the first frame aren't 0"); + if (png_ptr->num_frames_written == 0 && @@ -1522,11 +1565,11 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c + height != png_ptr->first_frame_height)) + png_error(png_ptr, "width and/or height in the first frame's fcTL " + "don't match the ones in IHDR"); -+ ++ + /* more error checking */ + png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, + delay_num, delay_den, dispose_op, blend_op); -+ ++ + png_save_uint_32(data, png_ptr->next_seq_num); + png_save_uint_32(data + 4, width); + png_save_uint_32(data + 8, height); @@ -1536,9 +1579,9 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c + png_save_uint_16(data + 22, delay_den); + data[24] = dispose_op; + data[25] = blend_op; -+ -+ png_write_chunk(png_ptr, png_fcTL, data, (png_size_t)26); -+ ++ ++ png_write_chunk(png_ptr, (png_bytep)png_fcTL, data, (png_size_t)26); ++ + png_ptr->next_seq_num++; +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ @@ -1546,18 +1589,18 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structp png_ptr) -@@ -2203,8 +2292,8 @@ +@@ -2159,8 +2252,8 @@ #ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS) { -- /* These will never be selected so we need not test them. */ -- filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH); -+ /* These use previous row */ -+ filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH); +- /* These will never be selected so we need not test them. */ +- filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH); ++ /* These use previous row */ ++ filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH); } - #endif + #endif -@@ -2945,4 +3034,39 @@ +@@ -2829,4 +2922,39 @@ } #endif } @@ -1584,12 +1627,12 @@ diff -Nur libpng-1.5.1.orig/pngwutil.c libpng-1.5.1/pngwutil.c + height > png_ptr->first_frame_height) + png_error(png_ptr, "width and/or height for a frame greater than" + "the ones in IHDR"); -+ ++ + png_set_IHDR(png_ptr, info_ptr, width, height, + info_ptr->bit_depth, info_ptr->color_type, + info_ptr->interlace_type, info_ptr->compression_type, + info_ptr->filter_type); -+ ++ + png_ptr->width = width; + png_ptr->height = height; + png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width); diff --git a/package/libpng/patches/patch-ltmain_sh b/package/libpng/patches/patch-ltmain_sh index 8ead586e9..3dc47967e 100644 --- a/package/libpng/patches/patch-ltmain_sh +++ b/package/libpng/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- libpng-1.5.1.orig/ltmain.sh 2011-02-03 05:58:21.000000000 +0100 -+++ libpng-1.5.1/ltmain.sh 2011-03-27 19:35:09.613370655 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization +--- libpng-1.2.44.orig/ltmain.sh 2009-11-22 15:45:24.000000000 +0100 ++++ libpng-1.2.44/ltmain.sh 2011-01-14 00:13:24.000000000 +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/libpthread/Makefile b/package/libpthread/Makefile index 579f24990..169db676a 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -48,7 +48,7 @@ libpthread-dev-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/usr/lib ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD}/usr/lib/libpthread.so - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared*.a ${IDIR_LIBPTHREAD}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 896b4073a..68d1b442c 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -26,7 +26,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-cxx \ --disable-rpath diff --git a/package/libtool/patches/patch-libltdl_config_ltmain_sh b/package/libtool/patches/patch-libltdl_config_ltmain_sh new file mode 100644 index 000000000..bc46ecca5 --- /dev/null +++ b/package/libtool/patches/patch-libltdl_config_ltmain_sh @@ -0,0 +1,31 @@ +--- libtool-2.4.orig/libltdl/config/ltmain.sh 2010-09-22 16:45:43.000000000 +0200 ++++ libtool-2.4/libltdl/config/ltmain.sh 2011-01-15 12:03:36.000000000 +0100 +@@ -136,15 +136,15 @@ progpath="$0" + + : ${CP="cp -f"} + test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +-: ${EGREP="grep -E"} +-: ${FGREP="grep -F"} +-: ${GREP="grep"} ++: ${EGREP="/usr/bin/grep -E"} ++: ${FGREP="/usr/bin/grep -F"} ++: ${GREP="/usr/bin/grep"} + : ${LN_S="ln -s"} + : ${MAKE="make"} + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="sed"} ++: ${SED="/Volumes/adk/openadk/scripts/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -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*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 44352b17b..3726fd926 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBUPNP_DEV,libupnp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUPNP_DEV},${PKGSC_LIBUPNP_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-samples diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 0bf4b9afb..a50dec13f 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -24,7 +24,6 @@ $(eval $(call PKG_template,LIBXCB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEA include $(TOPDIR)/mk/python.mk -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= PYTHON=$(PYTHON) libxcb-install: diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 01d4ba466..19f12828d 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -23,7 +23,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBXML2_DEV,libxml2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_DEV},${PKGSC_LIBXML2_DEV})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --without-c14n \ --without-catalog \ --without-debug \ diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile index c350828a3..77f2c1d6a 100644 --- a/package/mpfr/Makefile +++ b/package/mpfr/Makefile @@ -12,8 +12,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPFR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - post-install: ${INSTALL_DIR} ${IDIR_MPFR}/usr/lib ${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib/ diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index e9aaddf9a..a89ea7c91 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -64,7 +64,7 @@ pre-configure: find ${WRKBUILD} -name *.o -exec rm {} \; find ${WRKBUILD} -name *.a -exec rm {} \; -libncurses-install: +post-install: # this is installed as libncurses - make libcurses a "link" rm -f ${WRKINST}/usr/lib/libcurses.so* echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so diff --git a/package/nss/Makefile b/package/nss/Makefile index 7455b1d37..09de717a1 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -58,9 +58,5 @@ post-install: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/nss ${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* \ ${STAGING_TARGET_DIR}/usr/include/nss - # needed for firefox 4 - ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/lib - $(INSTALL_DATA) ${WRKDIST}/dist/lib/libcrmf.a \ - ${STAGING_TARGET_DIR}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index 96a11c03a..aa3373cc5 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --with-libgcrypt-prefix='${STAGING_TARGET_DIR}/usr' post-install: diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile deleted file mode 100644 index 73812e426..000000000 --- a/package/openjdk/Makefile +++ /dev/null @@ -1,86 +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:= openjdk -PKG_VERSION:= 6 -PKG_EXTRAVER:= b22-28_feb_2011 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 fd3f35e8a8a2ef9a64c035ed66cea06d -PKG_DESCR:= OpenJDK Java VM -PKG_SECTION:= lang -PKG_BUILDDEP:= xproto jpeg zlib libX11 libpng freetype -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ - http://icedtea.classpath.org/download/source/ - -# autotools infrastructure for OpenJDK -ICEDTEA_NAME:= icedtea6 -ICEDTEA_VERSION:= 1.10 - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz -NO_DISTFILES:= 1 -WRKDIST= ${WRKDIR} - -PKG_SUBPKGS:= OPENJDK -PKG_CFLINE_OPENJDK:= select ADK_TOOLCHAIN_GCC_JAVA - -PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO JAMVM -PKGCD_ZERO:= zero-assembly backend -PKGCD_SHARK:= JIT backend -PKGCD_CACAO:= Cacao JIT backend -PKGCD_JAMVM:= JamVM backend - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y) -CONFIGURE_ARGS+= --enable-zero -endif -ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y) -CONFIGURE_ARGS+= --enable-shark -endif - -CONFIGURE_ARGS+= --disable-docs \ - --enable-bootstrap \ - --disable-openjdk-cross-compilation \ - --with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \ - --with-xalan2-jar=/usr/share/java/xalan.jar \ - --with-xalan2-serializer-jar=/usr/share/java/serializer.jar \ - --with-xerces2-jar=/usr/share/java/xercesImpl.jar \ - --with-ecj-jar=$(TOPDIR)/dl/ecj.jar \ - --with-gcj \ - --without-rhino \ - --disable-xrender \ - --disable-nss - -do-extract: - (cd ${WRKBUILD}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)) - (cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz) - -pre-configure: - (cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status} ; \ - ./configure \ - --enable-bootstrap \ - --enable-zero \ - --disable-docs \ - --disable-openjdk-cross-compilation \ - --with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \ - --with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \ - --with-xalan2-jar=/usr/share/java/xalan.jar \ - --with-xalan2-serializer-jar=/usr/share/java/serializer.jar \ - --with-xerces2-jar=/usr/share/java/xercesImpl.jar \ - --with-ecj-jar=$(TOPDIR)/dl/ecj.jar \ - --with-gcj \ - --without-rhino \ - --disable-xrender \ - --disable-nss \ - ); - (cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE} ) - -openjdk-install: - $(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in deleted file mode 100644 index 7e19f5159..000000000 --- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in +++ /dev/null @@ -1,29 +0,0 @@ ---- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.161291458 +0100 -+++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-03-28 17:00:03.591807998 +0200 -@@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow - @OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \ - @OPENJDK_SRC_DIR_FOUND_TRUE@ fi - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ if ! test -d openjdk ; then \ --@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPRl openjdk.hg openjdk ; \ -+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPR openjdk.hg openjdk ; \ - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ fi - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ set -e ; \ - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; \ -@@ -1576,7 +1576,7 @@ clean-overlay: - # FIXME (missing): Rename to clone-ecj. - stamps/extract-ecj.stamp: $(OPENJDK_TREE) - if ! test -d openjdk-ecj ; then \ -- cp -pPRl openjdk openjdk-ecj ; \ -+ cp -pPR openjdk openjdk-ecj ; \ - fi - mkdir -p stamps - touch stamps/extract-ecj.stamp -@@ -1644,7 +1644,7 @@ clean-patch-ecj: - stamps/native-ecj.stamp: - mkdir -p stamps ; \ - if test "x$(GCJ)" != "xno"; then \ -- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ -+ $(GCJ) -static $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ - --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ - fi ; \ - touch stamps/native-ecj.stamp diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure deleted file mode 100644 index d9b96d1d4..000000000 --- a/package/openjdk/patches/patch-icedtea6-1_10_configure +++ /dev/null @@ -1,479 +0,0 @@ ---- w-openjdk-6-1.orig/icedtea6-1.10/configure 2011-03-02 20:48:44.321157333 +0100 -+++ w-openjdk-6-1/icedtea6-1.10/configure 2011-03-28 15:30:08.791808629 +0200 -@@ -10805,22 +10805,6 @@ fi - - - --for ac_header in cups/cups.h cups/ppd.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- -- --else -- as_fn_error $? "\"CUPS headers were not found - -- try installing cups-devel.\"" "$LINENO" 5 --fi -- --done - - for ac_header in X11/X.h - do : -@@ -10879,46 +10863,6 @@ else - as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5 - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 --$as_echo_n "checking for main in -lgif... " >&6; } --if ${ac_cv_lib_gif_main+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lgif $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --int --main () --{ --return main (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_gif_main=yes --else -- ac_cv_lib_gif_main=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 --$as_echo "$ac_cv_lib_gif_main" >&6; } --if test "x$ac_cv_lib_gif_main" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBGIF 1 --_ACEOF -- -- LIBS="-lgif $LIBS" -- --else -- as_fn_error $? "\"giflib not found - try installing giflib-devel\"" "$LINENO" 5 --fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5 - $as_echo_n "checking for main in -lz... " >&6; } -@@ -11040,156 +10984,9 @@ fi - - - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5 --$as_echo_n "checking for XT... " >&6; } -- --if test -n "$XT_CFLAGS"; then -- pkg_cv_XT_CFLAGS="$XT_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xt") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XT_LIBS"; then -- pkg_cv_XT_LIBS="$XT_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xt") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1` -- else -- XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XT_PKG_ERRORS" >&5 -- -- XT_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XT_FOUND=no --else -- XT_CFLAGS=$pkg_cv_XT_CFLAGS -- XT_LIBS=$pkg_cv_XT_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XT_FOUND=yes --fi --if test "x${XT_FOUND}" = xno --then -- as_fn_error $? "Could not find Xt - \ -- Try installing libXt-devel." "$LINENO" 5 --fi -- -- -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5 --$as_echo_n "checking for XP... " >&6; } -- --if test -n "$XP_CFLAGS"; then -- pkg_cv_XP_CFLAGS="$XP_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XP_LIBS"; then -- pkg_cv_XP_LIBS="$XP_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- - --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1` -- else -- XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XP_PKG_ERRORS" >&5 - -- XP_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XP_FOUND=no --else -- XP_CFLAGS=$pkg_cv_XP_CFLAGS -- XP_LIBS=$pkg_cv_XP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XP_FOUND=yes --fi --if test "x${XP_FOUND}" = xno --then -- as_fn_error $? "Could not find Xp - \ -- Try installing libXp-devel." "$LINENO" 5 --fi - - - -@@ -11271,83 +11068,6 @@ fi - - - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5 --$as_echo_n "checking for XINERAMA... " >&6; } -- --if test -n "$XINERAMA_CFLAGS"; then -- pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XINERAMA_LIBS"; then -- pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1` -- else -- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XINERAMA_PKG_ERRORS" >&5 -- -- XINERAMA_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XINERAMA_FOUND=no --else -- XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS -- XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XINERAMA_FOUND=yes -- --fi --if test "x${XINERAMA_FOUND}" = xno --then -- as_fn_error $? "Could not find Xinerama - \ -- Try installing libXinerama-devel." "$LINENO" 5 --fi -- -- -- - if test "x${ENABLE_XRENDER}" = "xyes" - then - -@@ -11610,79 +11330,6 @@ fi - - - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5 --$as_echo_n "checking for XTST... " >&6; } -- --if test -n "$XTST_CFLAGS"; then -- pkg_cv_XTST_CFLAGS="$XTST_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XTST_LIBS"; then -- pkg_cv_XTST_LIBS="$XTST_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1` -- else -- XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XTST_PKG_ERRORS" >&5 -- -- XTST_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XTST_FOUND=no --else -- XTST_CFLAGS=$pkg_cv_XTST_CFLAGS -- XTST_LIBS=$pkg_cv_XTST_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XTST_FOUND=yes --fi --if test "x${XTST_FOUND}" = xno --then -- as_fn_error $? "Could not find Xtst - \ -- Try installing libXtst-devel." "$LINENO" 5 --fi - - - -@@ -11764,85 +11411,6 @@ fi - - - --if test "x${BUILD_OS_DIR}" = "xlinux" --then -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 --$as_echo_n "checking for ALSA... " >&6; } -- --if test -n "$ALSA_CFLAGS"; then -- pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "alsa") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$ALSA_LIBS"; then -- pkg_cv_ALSA_LIBS="$ALSA_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "alsa") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1` -- else -- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$ALSA_PKG_ERRORS" >&5 -- -- ALSA_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- ALSA_FOUND=no --else -- ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS -- ALSA_LIBS=$pkg_cv_ALSA_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- ALSA_FOUND=yes --fi -- if test "x${ALSA_FOUND}" = xno -- then -- as_fn_error $? "Could not find alsa - \ -- Try installing alsa-lib-devel." "$LINENO" 5 -- fi -- -- --fi - - if test "x${enable_pulse_java}" = "xyes" - then diff --git a/package/openjdk/patches/patch-openjdk-6_Makefile b/package/openjdk/patches/patch-openjdk-6_Makefile deleted file mode 100644 index 2364d7ec0..000000000 --- a/package/openjdk/patches/patch-openjdk-6_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- w-openjdk-6-1.orig/openjdk-6/Makefile 2011-02-28 17:02:07.000000000 +0100 -+++ w-openjdk-6-1/openjdk-6/Makefile 2011-03-28 20:06:13.751809044 +0200 -@@ -25,9 +25,7 @@ - - BUILD_PARENT_DIRECTORY=. - --ifndef TOPDIR -- TOPDIR:=. --endif -+TOPDIR:=. - - ifndef JDK_TOPDIR - JDK_TOPDIR=$(TOPDIR)/jdk diff --git a/package/openldap/Makefile b/package/openldap/Makefile index bd2492ad0..a935994cb 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.4.25 +PKG_VERSION:= 2.4.24 PKG_RELEASE:= 1 -PKG_MD5SUM:= ec63f9c2add59f323a0459128846905b +PKG_MD5SUM:= 116fe1e23a7b67686d5e62274367e6c0 PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsasl2 diff --git a/package/openldap/patches/patch-build_ltmain_sh b/package/openldap/patches/patch-build_ltmain_sh index 3b48ef1c9..5876849e1 100644 --- a/package/openldap/patches/patch-build_ltmain_sh +++ b/package/openldap/patches/patch-build_ltmain_sh @@ -1,6 +1,6 @@ ---- openldap-2.4.25.orig/build/ltmain.sh 2011-01-05 00:49:25.000000000 +0100 -+++ openldap-2.4.25/build/ltmain.sh 2011-03-30 18:26:08.621808325 +0200 -@@ -1668,7 +1672,7 @@ EOF +--- openldap-2.4.23.orig/build/ltmain.sh 2010-04-13 22:22:21.000000000 +0200 ++++ openldap-2.4.23/build/ltmain.sh 2011-01-15 12:35:41.000000000 +0100 +@@ -1668,7 +1668,7 @@ EOF # -pg 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*|-pg| \ diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile deleted file mode 100644 index db64efe10..000000000 --- a/package/orbit2/Makefile +++ /dev/null @@ -1,45 +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:= ORBit2 -PKG_VERSION:= 2.14.19 -PKG_EXTRAVER:= 2.14 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9 -PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker -PKG_SECTION:= libs -PKG_BUILDDEP:= libIDL -PKG_URL:= http://projects.gnome.org/ORBit2/ -PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/ - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --cflags) -LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs) -LDFLAGS_FOR_BUILD+= -lgmodule-2.0 -CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ - ac_cv_alignof_CORBA_boolean=1 \ - ac_cv_alignof_CORBA_char=1 \ - ac_cv_alignof_CORBA_wchar=2 \ - ac_cv_alignof_CORBA_short=2 \ - ac_cv_alignof_CORBA_long=4 \ - ac_cv_alignof_CORBA_long_long=4 \ - ac_cv_alignof_CORBA_float=4 \ - ac_cv_alignof_CORBA_double=4 \ - ac_cv_alignof_CORBA_long_double=4 \ - ac_cv_alignof_CORBA_struct=1 \ - ac_cv_alignof_CORBA_pointer=4 - -orbit2-install: - $(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib - $(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \ - $(IDIR_ORBIT2)/usr/lib - $(INSTALL_DIR) $(STAGING_DIR)/usr/bin - $(CP) $(WRKINST)/usr/bin/orbit-idl-2 \ - $(STAGING_DIR)/usr/bin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/orbit2/patches/patch-ORBit-2_0_pc_in b/package/orbit2/patches/patch-ORBit-2_0_pc_in deleted file mode 100644 index 394e62a0c..000000000 --- a/package/orbit2/patches/patch-ORBit-2_0_pc_in +++ /dev/null @@ -1,11 +0,0 @@ ---- ORBit2-2.14.19.orig/ORBit-2.0.pc.in 2010-02-09 13:05:35.000000000 +0100 -+++ ORBit2-2.14.19/ORBit-2.0.pc.in 2011-03-25 21:11:02.000000000 +0100 -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --orbit_idl=@bindir@/orbit-idl-2@EXEEXT@ -+orbit_idl=${prefix}/../@bindir@/orbit-idl-2@EXEEXT@ - - - Name: ORBit-2.0 diff --git a/package/orbit2/patches/patch-configure b/package/orbit2/patches/patch-configure deleted file mode 100644 index e2a4d02c9..000000000 --- a/package/orbit2/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- ORBit2-2.14.19.orig/configure 2010-09-28 11:39:37.000000000 +0200 -+++ ORBit2-2.14.19/configure 2011-03-25 19:39:53.000000000 +0100 -@@ -8373,7 +8373,7 @@ $as_echo_n "checking whether the $compil - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -+ #export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' diff --git a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in deleted file mode 100644 index 2053d9f29..000000000 --- a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in +++ /dev/null @@ -1,54 +0,0 @@ ---- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in 2010-09-28 11:39:39.000000000 +0200 -+++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2011-03-25 20:28:46.000000000 +0100 -@@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+ --mode=compile $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -+CCLD = $(CC_FOR_BUILD) -+LINK = $(CCLD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ - SOURCES = $(orbit_idl_2_SOURCES) - DIST_SOURCES = $(orbit_idl_2_SOURCES) - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -@@ -178,8 +176,8 @@ ORBIT_ALIGNOF_CORBA_SHORT = @ORBIT_ALIGN - ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ - ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ - ORBIT_CFLAGS = @ORBIT_CFLAGS@ --ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ --ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ -+ORBIT_IDL_CFLAGS = -+ORBIT_IDL_LIBS = - ORBIT_LIBS = @ORBIT_LIBS@ - ORBIT_MAJOR_VERSION = @ORBIT_MAJOR_VERSION@ - ORBIT_MICRO_VERSION = @ORBIT_MICRO_VERSION@ -@@ -199,7 +197,7 @@ PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -+PKG_CONFIG_LIBDIR = $(PKG_HOSTLIB_DIR) - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - RANLIB = @RANLIB@ - SED = @SED@ -@@ -270,8 +268,7 @@ INCLUDES = \ - -DVERSION=\"$(ORBIT_VERSION)\" \ - -DORBIT2_INTERNAL_API \ - $(WARN_CFLAGS) \ -- $(DISABLE_DEPRECATED_CFLAGS) \ -- $(ORBIT_IDL_CFLAGS) -+ $(DISABLE_DEPRECATED_CFLAGS) - - orbit_idl_2_LDADD = \ - $(ORBIT_IDL_LIBS) \ diff --git a/package/pango/Makefile b/package/pango/Makefile index e60684cc8..9224f3d9e 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -26,8 +26,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - pango-install: $(INSTALL_DIR) $(IDIR_PANGO)/etc/pango $(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules diff --git a/package/pixman/Makefile b/package/pixman/Makefile index 939353eaf..50b61a3a9 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -24,11 +24,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,PIXMAN_DEV,pixman-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PIXMAN_DEV},${PKGSC_PIXMAN_DEV},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - pixman-install: ${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib/ pixman-dev-install: ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/include diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 1b5fc596c..3ce9d6a19 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -20,7 +20,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ --cross-prefix=$(TARGET_CROSS) \ diff --git a/package/section.lst b/package/section.lst index d66959632..36bcde679 100644 --- a/package/section.lst +++ b/package/section.lst @@ -40,7 +40,6 @@ utils Utilities www HTTP / FTP wifi Wireless x11/apps X applications -x11/lxde Lightweight X Desktop Environment x11/drivers X drivers x11/server X server x11/libs X libraries diff --git a/package/speex/Makefile b/package/speex/Makefile index db3b2bcc4..873ad347a 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -18,7 +18,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --without-ogg --disable-oggtest --enable-fixed-point XAKE_FLAGS+= bin_PROGRAMS="" diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index c9eab7a52..2b6c0fc4a 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKG_SECTION})) $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= config_BUILD_CC="${CC_FOR_BUILD}" \ config_BUILD_CFLAGS="${CFLAGS_FOR_BUILD}" \ config_TARGET_CC="${TARGET_CC}" \ @@ -33,7 +32,7 @@ CONFIGURE_ENV+= config_BUILD_CC="${CC_FOR_BUILD}" \ config_TARGET_READLINE_LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lreadline -lncurses" MAKE_FLAGS+= LIBPTHREAD=-lm -TARGET_CPPFLAGS+= -DSQLITE_SECURE_DELETE=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 +TARGET_CPPFLAGS+= -DSQLITE_SECURE_DELETE=1 libsqlite-install: ${INSTALL_DIR} ${IDIR_LIBSQLITE}/usr/lib diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index d47b41966..b15604125 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -46,10 +46,10 @@ endif done uclibc-dev-install: - ${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib ${IDIR_UCLIBC_DEV}/lib + ${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_DEV}/usr/lib - -${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_DEV}/usr/lib - -${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_DEV}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib -for file in libc libcrypt libdl libm libresolv librt libutil; do \ cd $(IDIR_UCLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \ done diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 893287ee1..1d24840d8 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -24,7 +24,7 @@ include $(TOPDIR)/mk/python.mk CONFIGURE_ENV+= PYTHON=$(PYTHON) xcb-proto-install: - ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share + ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share/ ${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb ${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_DIR}/usr/share/xcb -- cgit v1.2.3