recipe upgrades, Apr. 29
cover recipe upgrades, Apr. 29
From: Qing He <[email protected]>
upgraded 9 recipes
add 1: nettle as the new dependency of gnutls
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/upgrade
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/upgrade
Thanks,
Qing He <[email protected]>
---
Qing He (10):
attr: upgrade to version 2.4.46
acl: upgrade to version 2.2.51
augeas: upgrade to version 0.8.1
curl: upgrade to version 7.21.6
busybox: upgrade to version 1.18.4
nettle: add new recipe
gnutls: upgrade to version 2.12.3
shared-mime-info: upgrade to version 0.90
lzo: upgrade to version 2.05
libcap: upgrade to version 2.20
.../busybox/busybox-1.17.3/make-382-fix.patch | 25 -
.../B921600.patch | 0
.../busybox-appletlib-dependency.patch | 0
.../busybox-udhcpc-no_deconfig.patch | 19 +-
.../{busybox-1.17.3 => busybox-1.18.4}/defconfig | 0
.../get_header_tar.patch | 4 +-
.../run-parts.in.usr-bin.patch | 0
.../udhcpc-fix-nfsroot.patch | 0
.../udhcpscript.patch | 0
.../{busybox_1.17.3.bb => busybox_1.18.4.bb} | 7 +-
meta/recipes-extended/augeas/augeas_0.7.4.bb | 6 -
meta/recipes-extended/augeas/augeas_0.8.1.bb | 6 +
meta/recipes-support/attr/acl_2.2.49.bb | 6 -
meta/recipes-support/attr/acl_2.2.51.bb | 6 +
.../attr/attr-2.4.44/double-free.patch | 18 -
.../attr/attr-2.4.44/memory-leak-in-copy.patch | 50 -
.../attr/attr-2.4.44/memory-leak2.patch | 18 -
.../attr/attr-2.4.44/pull-in-string.h.patch | 21 -
.../attr/attr-2.4.44/thinko-in-restore.patch | 19 -
meta/recipes-support/attr/attr_2.4.44.bb | 12 -
meta/recipes-support/attr/attr_2.4.46.bb | 6 +
meta/recipes-support/attr/ea-acl.inc | 2 +-
.../attr/files/no-fixed-prog-path.patch | 99 --
meta/recipes-support/curl/curl/noldlibpath.patch | 2 +
meta/recipes-support/curl/curl/pkgconfig_fix.patch | 5 +-
.../curl/{curl_7.21.2.bb => curl_7.21.6.bb} | 6 +-
.../gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch | 16 -
.../configure-fix.patch | 14 +-
.../gnutls-openssl.patch | 2 +
meta/recipes-support/gnutls/gnutls_2.10.4.bb | 10 -
meta/recipes-support/gnutls/gnutls_2.12.3.bb | 11 +
meta/recipes-support/libcap/libcap.inc | 2 +-
meta/recipes-support/libcap/libcap_2.19.bb | 6 -
meta/recipes-support/libcap/libcap_2.20.bb | 6 +
.../lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 | 0
.../lzo/{lzo-2.04 => lzo-2.05}/autoconf.patch | 4 +-
.../lzo/{lzo_2.04.bb => lzo_2.05.bb} | 8 +-
meta/recipes-support/nettle/files/acinclude.m4 | 1062 ++++++++++++++++++++
meta/recipes-support/nettle/nettle_2.1.bb | 31 +
.../files/fix-parallel-build.patch | 33 +
.../shared-mime-info/shared-mime-info_0.80.bb | 5 -
.../shared-mime-info/shared-mime-info_0.90.bb | 7 +
42 files changed, 1208 insertions(+), 346 deletions(-)
delete mode 100644 meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/B921600.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/busybox-appletlib-dependency.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/busybox-udhcpc-no_deconfig.patch (90%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/defconfig (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/get_header_tar.patch (76%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/run-parts.in.usr-bin.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/udhcpc-fix-nfsroot.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/udhcpscript.patch (100%)
rename meta/recipes-core/busybox/{busybox_1.17.3.bb => busybox_1.18.4.bb} (81%)
delete mode 100644 meta/recipes-extended/augeas/augeas_0.7.4.bb
create mode 100644 meta/recipes-extended/augeas/augeas_0.8.1.bb
delete mode 100644 meta/recipes-support/attr/acl_2.2.49.bb
create mode 100644 meta/recipes-support/attr/acl_2.2.51.bb
delete mode 100644 meta/recipes-support/attr/attr-2.4.44/double-free.patch
delete mode 100644 meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch
delete mode 100644 meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch
delete mode 100644 meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch
delete mode 100644 meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch
delete mode 100644 meta/recipes-support/attr/attr_2.4.44.bb
create mode 100644 meta/recipes-support/attr/attr_2.4.46.bb
delete mode 100644 meta/recipes-support/attr/files/no-fixed-prog-path.patch
rename meta/recipes-support/curl/{curl_7.21.2.bb => curl_7.21.6.bb} (92%)
delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch
rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.3}/configure-fix.patch (76%)
rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.3}/gnutls-openssl.patch (98%)
delete mode 100644 meta/recipes-support/gnutls/gnutls_2.10.4.bb
create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.3.bb
delete mode 100644 meta/recipes-support/libcap/libcap_2.19.bb
create mode 100644 meta/recipes-support/libcap/libcap_2.20.bb
rename meta/recipes-support/lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 (100%)
rename meta/recipes-support/lzo/{lzo-2.04 => lzo-2.05}/autoconf.patch (84%)
rename meta/recipes-support/lzo/{lzo_2.04.bb => lzo_2.05.bb} (59%)
create mode 100644 meta/recipes-support/nettle/files/acinclude.m4
create mode 100644 meta/recipes-support/nettle/nettle_2.1.bb
create mode 100644 meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_0.80.bb
create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bbPATCH 2/10 acl: upgrade to version 2.2.51
From: Qing He <[email protected]>
from 2.2.49
--- meta/recipes-support/attr/acl_2.2.49.bb | 6 ------ meta/recipes-support/attr/acl_2.2.51.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-support/attr/acl_2.2.49.bb create mode 100644 meta/recipes-support/attr/acl_2.2.51.bb
meta/recipes-support/attr/acl_2.2.49.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require acl.inc - -PR = "r1" - -SRC_URI[md5sum] = "181445894cca986da9ae0099d5ce2d08" -SRC_URI[sha256sum] = "b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5"
meta/recipes-support/attr/acl_2.2.51.bb new file +6 -0
@@ -0,0 +1,6 @@ +require acl.inc + +PR = "r0" + +SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267" +SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
Signature · 1 line
1.7.0
PATCH 3/10 augeas: upgrade to version 0.8.1
In reply to Qing HeFrom: Qing He <[email protected]>
from 0.7.4
--- meta/recipes-extended/augeas/augeas_0.7.4.bb | 6 ------ meta/recipes-extended/augeas/augeas_0.8.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-extended/augeas/augeas_0.7.4.bb create mode 100644 meta/recipes-extended/augeas/augeas_0.8.1.bb
meta/recipes-extended/augeas/augeas_0.7.4.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require augeas.inc - -PR = "r0" - -SRC_URI[md5sum] = "e3ddce5305a15bdb876ef7feec9214d1" -SRC_URI[sha256sum] = "02ba7b4f1d0796dff6ea5f8cc5f4949e4ba30b7fa2f36a0c8a5079f9975060d1"
meta/recipes-extended/augeas/augeas_0.8.1.bb new file +6 -0
@@ -0,0 +1,6 @@ +require augeas.inc + +PR = "r0" + +SRC_URI[md5sum] = "62d47bdc60e175f93aed3b81cb8e2785" +SRC_URI[sha256sum] = "916fef67e8eed6d1abe02433830301bd01dfc8228e9cfffb490347545155c4d7"
Signature · 1 line
1.7.0
PATCH 4/10 curl: upgrade to version 7.21.6
In reply to Qing HeFrom: Qing He <[email protected]>
from 7.21.2
---
meta/recipes-support/curl/curl/noldlibpath.patch | 2 ++
meta/recipes-support/curl/curl/pkgconfig_fix.patch | 5 ++++-
.../curl/{curl_7.21.2.bb => curl_7.21.6.bb} | 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
rename meta/recipes-support/curl/{curl_7.21.2.bb => curl_7.21.6.bb} (92%)meta/recipes-support/curl/curl/noldlibpath.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [embedded specific] + Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling. Since we never run compiled binaries for the target, we should *never* need to change LD_LIBRARY_PATH.
meta/recipes-support/curl/curl/pkgconfig_fix.patch +4 -1
@@ -1,3 +1,6 @@ +Upstream-Status: Inappropriate [packaging] + + Index: curl-7.20.0/libcurl.pc.in =================================================================== --- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000
@@ -5,7 +8,7 @@ Index: curl-7.20.0/libcurl.pc.in @@ -35,6 +35,7 @@ URL: http://curl.haxx.se/ Description: Library to transfer files with ftp, http, etc. - Version: @VERSION@ + Version: @CURLVERSION@ -Libs: -L${libdir} -lcurl @LIBS@ -Libs.private: @LIBCURL_LIBS@ @LIBS@ +Requires.private: @GNUTLS_REQUIRED@
meta/recipes-support/curl/curl_7.21.6.bb renamed from meta/recipes-support/curl/curl_7.21.2.bb +3 -3
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 DEPENDS = "zlib gnutls" DEPENDS_virtclass-native = "zlib-native" DEPENDS_virtclass-nativesdk = "zlib-nativesdk" -PR = "r1" +PR = "r0" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \ file://pkgconfig_fix.patch" -SRC_URI[md5sum] = "ca96df88e044c7c25d19692ec8b250b2" -SRC_URI[sha256sum] = "f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21" +SRC_URI[md5sum] = "6611989a81ebd7b03a35adc3001ddee0" +SRC_URI[sha256sum] = "d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955" inherit autotools pkgconfig binconfig
Signature · 1 line
1.7.0
PATCH 5/10 busybox: upgrade to version 1.18.4
In reply to Qing HeFrom: Qing He <[email protected]>
from version 1.17.3
- remove make-382-fix since it's upstreamed
---
.../busybox/busybox-1.17.3/make-382-fix.patch | 25 --------------------
.../B921600.patch | 0
.../busybox-appletlib-dependency.patch | 0
.../busybox-udhcpc-no_deconfig.patch | 19 ++++++++++----
.../{busybox-1.17.3 => busybox-1.18.4}/defconfig | 0
.../get_header_tar.patch | 4 +-
.../run-parts.in.usr-bin.patch | 0
.../udhcpc-fix-nfsroot.patch | 0
.../udhcpscript.patch | 0
.../{busybox_1.17.3.bb => busybox_1.18.4.bb} | 7 ++---
10 files changed, 18 insertions(+), 37 deletions(-)
delete mode 100644 meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/B921600.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/busybox-appletlib-dependency.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/busybox-udhcpc-no_deconfig.patch (90%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/defconfig (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/get_header_tar.patch (76%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/run-parts.in.usr-bin.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/udhcpc-fix-nfsroot.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/udhcpscript.patch (100%)
rename meta/recipes-core/busybox/{busybox_1.17.3.bb => busybox_1.18.4.bb} (81%)meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From ef6c6d8cfef071435ccf275ad404a501626b706c Mon Sep 17 00:00:00 2001 -From: Thomas Chou <[email protected]> -Date: Tue, 19 Oct 2010 07:17:12 +0000 -Subject: mkmakefile: make 3.82 fix - -Signed-off-by: Thomas Chou <[email protected]> -Signed-off-by: Denys Vlasenko <[email protected]> ---- -diff --git a/scripts/mkmakefile b/scripts/mkmakefile -index 7f9d544..9fc51a7 100755 ---- a/scripts/mkmakefile -+++ b/scripts/mkmakefile -@@ -31,6 +31,9 @@ all: - - Makefile:; - --\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/: -+\$(filter-out all Makefile,\$(MAKECMDGOALS)): -+ \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ -+ -+%/: - \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ - EOF --- -cgit v0.8.2.1
meta/recipes-core/busybox/busybox-1.18.4/B921600.patch renamed from meta/recipes-core/busybox/busybox-1.17.3/B921600.patch +0 -0
meta/recipes-core/busybox/busybox-1.18.4/busybox-appletlib-dependency.patch renamed from meta/recipes-core/busybox/busybox-1.17.3/busybox-appletlib-dependency.patch +0 -0
meta/recipes-core/busybox/busybox-1.18.4/busybox-udhcpc-no_deconfig.patch renamed from meta/recipes-core/busybox/busybox-1.17.3/busybox-udhcpc-no_deconfig.patch +13 -6
@@ -1,3 +1,5 @@ +Upstream-Status: Pending + Add a new option -D to the udhcpc client that allows for dhcp renewal to occur without having to down the interface in the process.
@@ -8,6 +10,11 @@ Updated to latest Busybox 1.17.3 Signed-off-by: Mark Hatle <[email protected]> +Updated to Busybox 1.18.4 +option spec is changed + +Signed-off-by: Qing He <[email protected]> + diff -ur busybox-1.17.3.orig/networking/udhcp/dhcpc.c busybox-1.17.3/networking/udhcp/dhcpc.c --- busybox-1.17.3.orig/networking/udhcp/dhcpc.c +++ busybox-1.17.3/networking/udhcp/dhcpc.c
@@ -42,10 +49,10 @@ diff -ur busybox-1.17.3.orig/networking/udhcp/dhcpc.c busybox-1.17.3/networking/ bb_info_msg("Entering released state"); @@ -836,6 +841,7 @@ - OPT_o = 1 << 18, - OPT_x = 1 << 19, - OPT_f = 1 << 20, -+ OPT_D = 1 << 21, + OPT_o = 1 << 17, + OPT_x = 1 << 18, + OPT_f = 1 << 19, ++ OPT_D = 1 << 20, /* The rest has variable bit positions, need to be clever */ OPTBIT_f = 20, USE_FOR_MMU( OPTBIT_b,)
@@ -53,8 +60,8 @@ diff -ur busybox-1.17.3.orig/networking/udhcp/dhcpc.c busybox-1.17.3/networking/ #endif ; IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) -- opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:f" -+ opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fD" +- opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:f" ++ opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fD" USE_FOR_MMU("b") IF_FEATURE_UDHCPC_ARPING("a") IF_FEATURE_UDHCP_PORT("P:")
meta/recipes-core/busybox/busybox-1.18.4/defconfig renamed from meta/recipes-core/busybox/busybox-1.17.3/defconfig +0 -0
meta/recipes-core/busybox/busybox-1.18.4/get_header_tar.patch renamed from meta/recipes-core/busybox/busybox-1.17.3/get_header_tar.patch +2 -2
@@ -7,8 +7,8 @@ # # above comment added by Kevin Tian <[email protected]>, 2010-07-06 ---- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 -+++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 +--- busybox-1.13.2/archival/libarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2/archival/libarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 @@ -252,6 +252,8 @@ file_header->name = concat_path_file(tar.prefix, tar.name); } else
meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch renamed from meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch +0 -0
meta/recipes-core/busybox/busybox-1.18.4/udhcpc-fix-nfsroot.patch renamed from meta/recipes-core/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch +0 -0
meta/recipes-core/busybox/busybox-1.18.4/udhcpscript.patch renamed from meta/recipes-core/busybox/busybox-1.17.3/udhcpscript.patch +0 -0
meta/recipes-core/busybox/busybox_1.18.4.bb renamed from meta/recipes-core/busybox/busybox_1.17.3.bb +3 -4
@@ -1,5 +1,5 @@ require busybox.inc -PR = "r2" +PR = "r0" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \
@@ -8,7 +8,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://get_header_tar.patch \ file://busybox-appletlib-dependency.patch \ file://run-parts.in.usr-bin.patch \ - file://make-382-fix.patch \ file://busybox-udhcpc-no_deconfig.patch \ file://find-touchscreen.sh \ file://busybox-cron \
@@ -24,7 +23,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://umount.busybox \ file://defconfig" -SRC_URI[tarball.md5sum] = "a2ce1a951571da8c6e0eaf75b1acef60" -SRC_URI[tarball.sha256sum] = "de2f0274f61a068d75ad33861e0982e99c6b625681460ce420222371c3511ff2" +SRC_URI[tarball.md5sum] = "b03c5b46ced732679e525a920a1a62f5" +SRC_URI[tarball.sha256sum] = "4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
Signature · 1 line
1.7.0
PATCH 7/10 gnutls: upgrade to version 2.12.3
In reply to Qing HeFrom: Qing He <[email protected]>
from 2.10.4
- added nettle dependency
---
.../gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch | 16 ----------------
.../configure-fix.patch | 14 ++------------
.../gnutls-openssl.patch | 2 ++
meta/recipes-support/gnutls/gnutls_2.10.4.bb | 10 ----------
meta/recipes-support/gnutls/gnutls_2.12.3.bb | 11 +++++++++++
5 files changed, 15 insertions(+), 38 deletions(-)
delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch
rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.3}/configure-fix.patch (76%)
rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.3}/gnutls-openssl.patch (98%)
delete mode 100644 meta/recipes-support/gnutls/gnutls_2.10.4.bb
create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.3.bbmeta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch deleted +0 -16
@@ -1,16 +0,0 @@ -The version of texinfo in Debian Sarge does not understand the @euro{} command. -This patch replaces the @euro{} command with the word "euro". - ---- gnutls-1.3.5/doc/gnutls.texi.orig 2006-04-26 08:06:40.918268000 +0930 -+++ gnutls-1.3.5/doc/gnutls.texi 2006-04-26 08:06:52.446515440 +0930 -@@ -11,8 +11,8 @@ - long as it is difficult enough to generate two different messages with - the same hash algorithm output. In that case the same signature could - be used as a proof for both messages. Nobody wants to sign an innocent --message of donating 1 @euro{} to Greenpeace and find out that he --donated 1.000.000 @euro{} to Bad Inc. -+message of donating 1 euro to Greenpeace and find out that he -+donated 1.000.000 euro to Bad Inc. - - For a hash algorithm to be called cryptographic the following three - requirements must hold
meta/recipes-support/gnutls/gnutls-2.12.3/configure-fix.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch +2 -12
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [packaging] + rebased from original configure_madness.patch libtasn1 provides an .pc file in upstream,
@@ -24,18 +26,6 @@ index 80d3375..1a486f7 100644 AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_CFLAGS) -diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index 3b01c17..de31469 100644 ---- a/lib/gnutls.pc.in -+++ b/lib/gnutls.pc.in -@@ -20,6 +20,6 @@ Name: GnuTLS - Description: Transport Security Layer implementation for the GNU system - URL: http://www.gnu.org/software/gnutls/ - Version: @VERSION@ -+Requires.private: libgcrypt, libtasn1 - Libs: -L${libdir} -lgnutls --Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@ - Cflags: -I${includedir} diff --git a/libextra/configure.ac b/libextra/configure.ac index c08e73f..3313886 100644 --- a/libextra/configure.ac
meta/recipes-support/gnutls/gnutls-2.12.3/gnutls-openssl.patch renamed from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Source Unknown + Index: gnutls-1.6.0/libextra/gnutls_openssl.c =================================================================== --- gnutls-1.6.0.orig/libextra/gnutls_openssl.c 2006-08-13 22:34:09.000000000 +0200
meta/recipes-support/gnutls/gnutls_2.10.4.bb deleted +0 -10
@@ -1,10 +0,0 @@ -require gnutls.inc - -PR = "r0" - -SRC_URI += "file://gnutls-openssl.patch \ - file://gnutls-texinfo-euro.patch \ - file://configure-fix.patch" - -SRC_URI[md5sum] = "4e1517084018a8b1fdc96daabea40528" -SRC_URI[sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
meta/recipes-support/gnutls/gnutls_2.12.3.bb new file +11 -0
@@ -0,0 +1,11 @@ +require gnutls.inc + +DEPENDS += "nettle" + +PR = "r0" + +SRC_URI += "file://gnutls-openssl.patch \ + file://configure-fix.patch" + +SRC_URI[md5sum] = "04b72b022b42b10df12cbbae051e2d55" +SRC_URI[sha256sum] = "9fb3dba10d3fa6c2817cd47260b4c39026c69128fb39fc5026f179b3672539d3"
Signature · 1 line
1.7.0
PATCH 8/10 shared-mime-info: upgrade to version 0.90
In reply to Qing HeFrom: Qing He <[email protected]>
from 0.80
- parallel build with 0.9 is buggy, disable part of the check for now
--- .../files/fix-parallel-build.patch | 33 ++++++++++++++++++++ .../shared-mime-info/shared-mime-info_0.80.bb | 5 --- .../shared-mime-info/shared-mime-info_0.90.bb | 7 ++++ 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_0.80.bb create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch new file +33 -0
@@ -0,0 +1,33 @@ +the check rule will trigger a weird dependency issue in automake, +it's possible that update-mime-database are invoked simultaneously in +two different threads at the same time. + +As a workaround, revert it to the logic in 0.80 + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: qing He <[email protected]> + +diff --git a/Makefile.am b/Makefile.am +index 1a887bc..9df581e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -72,7 +72,7 @@ uninstall-hook: + create-pot: + $(MAKE) -C po shared-mime-info.pot + +-check: freedesktop.org.xml update-mime-database check-translations ++check: freedesktop.org.xml check-translations + if test -n $(XMLLINT) ; then \ + if test -e $(top_builddir)/freedesktop.org.xml; then \ + xmllint --noout --valid $(top_builddir)/freedesktop.org.xml; \ +@@ -80,9 +80,6 @@ check: freedesktop.org.xml update-mime-database check-translations + xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml; \ + fi \ + fi +- if test -d .git/ && test -x $(top_builddir)/update-mime-database && test -d $(top_srcdir)/mime-db-tests ; then \ +- $(top_builddir)/update-mime-database mime-db-tests/ ; \ +- fi + if test -d .git/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \ + mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \ + cp -a $(top_builddir)/freedesktop.org.xml $(top_builddir)/temp-mime-dir/mime/packages/ ; \
meta/recipes-support/shared-mime-info/shared-mime-info_0.80.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require shared-mime-info.inc -PR = "r0" - -SRC_URI[md5sum] = "eb8d24a6a80888849c9db7f30232ba6a" -SRC_URI[sha256sum] = "80857ba19f8066bfc8d998bfc72b492e241ebd52d49c245aae9fd5b3d233b024"
meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb new file +7 -0
@@ -0,0 +1,7 @@ +require shared-mime-info.inc +PR = "r0" + +SRC_URI += "file://fix-parallel-build.patch" + +SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b" +SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304"
Signature · 1 line
1.7.0
PATCH 9/10 lzo: upgrade to version 2.05
In reply to Qing HeFrom: Qing He <[email protected]>
from 2.04
---
.../lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 | 0
.../lzo/{lzo-2.04 => lzo-2.05}/autoconf.patch | 4 +++-
.../lzo/{lzo_2.04.bb => lzo_2.05.bb} | 8 ++++----
3 files changed, 7 insertions(+), 5 deletions(-)
rename meta/recipes-support/lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 (100%)
rename meta/recipes-support/lzo/{lzo-2.04 => lzo-2.05}/autoconf.patch (84%)
rename meta/recipes-support/lzo/{lzo_2.04.bb => lzo_2.05.bb} (59%)meta/recipes-support/lzo/lzo-2.05/acinclude.m4 renamed from meta/recipes-support/lzo/lzo-2.04/acinclude.m4 +0 -0
meta/recipes-support/lzo/lzo-2.05/autoconf.patch renamed from meta/recipes-support/lzo/lzo-2.04/autoconf.patch +3 -1
@@ -2,6 +2,8 @@ Date: 12/31/2010 Didn't find 2.67 specific features, so lower the requirement to pass build +Upstream-Status: Inappropriate [workaround] + Signed-off-by: Qing He <[email protected]> --- diff --git a/configure.ac b/configure.ac
@@ -14,6 +16,6 @@ index 650749a..2a78845 100644 -AC_PREREQ(2.67) +AC_PREREQ(2.65) - AC_INIT([LZO],[2.04],[[email protected]],[lzo],[http://www.oberhumer.com/opensource/lzo/]) + AC_INIT([LZO],[2.05],[[email protected]],[lzo],[http://www.oberhumer.com/opensource/lzo/]) AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION]) AC_CONFIG_SRCDIR(src/lzo_init.c)
meta/recipes-support/lzo/lzo_2.05.bb renamed from meta/recipes-support/lzo/lzo_2.04.bb +4 -4
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8cad52263e636e25377bc18420118101 \ - file://src/lzo_init.c;beginline=5;endline=36;md5=454f781644dfe945e3634a9b699e91f3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://src/lzo_init.c;beginline=23;endline=40;md5=924a0f71f5394f6d404be3b458474769" PR = "r0" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \
@@ -12,8 +12,8 @@ SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ file://acinclude.m4 \ " -SRC_URI[md5sum] = "a383c7055a310e2a71b9ecd19cfea238" -SRC_URI[sha256sum] = "4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428" +SRC_URI[md5sum] = "c67cda5fa191bab761c7cb06fe091e36" +SRC_URI[sha256sum] = "449f98186d76ba252cd17ff1241ca2a96b7f62e0d3e4766f88730dab0ea5f333" inherit autotools
Signature · 1 line
1.7.0
PATCH 10/10 libcap: upgrade to version 2.20
In reply to Qing HeFrom: Qing He <[email protected]>
from 2.19
- set RAISE_SETFCAP=no in make option to inhibit target binary run
--- meta/recipes-support/libcap/libcap.inc | 2 +- meta/recipes-support/libcap/libcap_2.19.bb | 6 ------ meta/recipes-support/libcap/libcap_2.20.bb | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 meta/recipes-support/libcap/libcap_2.19.bb create mode 100644 meta/recipes-support/libcap/libcap_2.20.bb
meta/recipes-support/libcap/libcap.inc +1 -1
@@ -18,7 +18,7 @@ do_configure() { sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules } -EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= lib=lib SYSTEM_HEADERS=${STAGING_INCDIR}" +EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= lib=lib SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no" EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= lib=lib" do_compile() {
meta/recipes-support/libcap/libcap_2.19.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require libcap.inc - -PR = "r1" - -SRC_URI[md5sum] = "eb1ff04d39bfa2342b8e78b0fd60dc2d" -SRC_URI[sha256sum] = "ed1693e344054a398e68a7cc840892e3d1a880562743bdf28fd918649aa5a4ce"
meta/recipes-support/libcap/libcap_2.20.bb new file +6 -0
@@ -0,0 +1,6 @@ +require libcap.inc + +PR = "r0" + +SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4" +SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"
Signature · 1 line
1.7.0
PATCH 1/10 attr: upgrade to version 2.4.46
In reply to Qing HeFrom: Qing He <[email protected]>
from 2.4.44
- remove the backported patch that is now in the tarball
- prog path issue has also been fixed in the upstream
--- .../attr/attr-2.4.44/double-free.patch | 18 ---- .../attr/attr-2.4.44/memory-leak-in-copy.patch | 50 ---------- .../attr/attr-2.4.44/memory-leak2.patch | 18 ---- .../attr/attr-2.4.44/pull-in-string.h.patch | 21 ---- .../attr/attr-2.4.44/thinko-in-restore.patch | 19 ---- meta/recipes-support/attr/attr_2.4.44.bb | 12 --- meta/recipes-support/attr/attr_2.4.46.bb | 6 + meta/recipes-support/attr/ea-acl.inc | 2 +- .../attr/files/no-fixed-prog-path.patch | 99 -------------------- 9 files changed, 7 insertions(+), 238 deletions(-) delete mode 100644 meta/recipes-support/attr/attr-2.4.44/double-free.patch delete mode 100644 meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch delete mode 100644 meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch delete mode 100644 meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch delete mode 100644 meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch delete mode 100644 meta/recipes-support/attr/attr_2.4.44.bb create mode 100644 meta/recipes-support/attr/attr_2.4.46.bb delete mode 100644 meta/recipes-support/attr/files/no-fixed-prog-path.patch
meta/recipes-support/attr/attr-2.4.44/double-free.patch deleted +0 -18
@@ -1,18 +0,0 @@ -commit 5b28eb3b0e0430ce6af28edc9100ca23299d1218 -Author: Kamil Dudka <[email protected]> -Date: Thu Jun 3 15:29:54 2010 +0200 - - attr_parse_attr_conf: eliminate a double free - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index 030bbf5..2697328 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -81,6 +81,7 @@ repeat: - fclose(file); - file = NULL; - free(text); -+ text = NULL; - size_guess *= 2; - goto repeat; - }
meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch deleted +0 -18
@@ -1,18 +0,0 @@ -commit 42f50a130d144ffbc01738f15da9d4f1b57505bd -Author: Kamil Dudka <[email protected]> -Date: Thu Jun 3 15:23:04 2010 +0200 - - attr_parse_attr_conf: eliminate a memory leak - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index dc94224..030bbf5 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -129,6 +129,7 @@ repeat: - - t += strcspn(t, "\n"); - } -+ free(text); - return 0; - - parse_error:
meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch deleted +0 -21
@@ -1,21 +0,0 @@ -commit 235cdd2af498d288f1af1142e7a23fbd16dff907 -Author: Mike Frysinger <[email protected]> -Date: Fri Jan 8 21:53:19 2010 -0500 - - quote: pull in string.h for strchr prototype - - Signed-off-by: Mike Frysinger <[email protected]> - Signed-off-by: Brandon Philips <[email protected]> - -diff --git a/libmisc/quote.c b/libmisc/quote.c -index f98c887..bf8f9eb 100644 ---- a/libmisc/quote.c -+++ b/libmisc/quote.c -@@ -20,6 +20,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <ctype.h> -+#include <string.h> - #include "misc.h" - - const char *quote(const char *str, const char *quote_chars)
meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch deleted +0 -19
@@ -1,19 +0,0 @@ -commit e8d568c696692eed5c92d5a35498e1c26e13d6b3 -Author: Kamil Dudka <[email protected]> -Date: Thu Jun 3 15:30:19 2010 +0200 - - setfattr.c: fix thinko in restore() - -diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c -index 491c25a..0a14cfa 100644 ---- a/setfattr/setfattr.c -+++ b/setfattr/setfattr.c -@@ -120,7 +120,7 @@ int restore(const char *filename) - break; - line++; - if (strncmp(l, "# file: ", 8) != 0) { -- if (filename) { -+ if (file != stdin) { - fprintf(stderr, _("%s: %s: No filename found " - "in line %d, aborting\n"), - progname, filename, backup_line);
meta/recipes-support/attr/attr_2.4.44.bb deleted +0 -12
@@ -1,12 +0,0 @@ -require attr.inc - -PR = "r3" - -SRC_URI += "file://memory-leak-in-copy.patch \ - file://memory-leak2.patch \ - file://double-free.patch \ - file://pull-in-string.h.patch \ - file://thinko-in-restore.patch" - -SRC_URI[md5sum] = "d132c119831c27350e10b9f885711adc" -SRC_URI[sha256sum] = "9f6214b8e53f4bba651ac5a72c0f6193b12aa21fbf1d675d89a7b4bc45264498"
meta/recipes-support/attr/attr_2.4.46.bb new file +6 -0
@@ -0,0 +1,6 @@ +require attr.inc + +PR = "r0" + +SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010" +SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
meta/recipes-support/attr/ea-acl.inc +1 -1
@@ -1,7 +1,7 @@ # this build system is mostly shared by attr and acl SRC_URI += "file://relative-libdir.patch;striplevel=0 \ - file://no-fixed-prog-path.patch" + " inherit autotools gettext
meta/recipes-support/attr/files/no-fixed-prog-path.patch deleted +0 -99
99 lines not on this page · raw message
Signature · 1 line
1.7.0
PATCH 6/10 nettle: add new recipe
In reply to Qing HeFrom: Qing He <[email protected]>
version 2.1
--- meta/recipes-support/nettle/files/acinclude.m4 | 1062 ++++++++++++++++++++++++ meta/recipes-support/nettle/nettle_2.1.bb | 31 + 2 files changed, 1093 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-support/nettle/files/acinclude.m4 create mode 100644 meta/recipes-support/nettle/nettle_2.1.bb
meta/recipes-support/nettle/files/acinclude.m4 new file +1062 -0
@@ -0,0 +1,1062 @@ +dnl Try to detect the type of the third arg to getsockname() et al +AC_DEFUN([LSH_TYPE_SOCKLEN_T], +[AH_TEMPLATE([socklen_t], [Length type used by getsockopt]) +AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_type_socklen_t, +[AC_EGREP_HEADER(socklen_t, sys/socket.h, + [ac_cv_type_socklen_t=yes], [ac_cv_type_socklen_t=no])]) +if test $ac_cv_type_socklen_t = no; then + AC_MSG_CHECKING(for AIX) + AC_EGREP_CPP(yes, [ +#ifdef _AIX + yes +#endif +],[ +AC_MSG_RESULT(yes) +AC_DEFINE(socklen_t, size_t) +],[ +AC_MSG_RESULT(no) +AC_DEFINE(socklen_t, int) +]) +fi +]) + +dnl Choose cc flags for compiling position independent code +dnl FIXME: Doesn't do the right thing when crosscompiling. +AC_DEFUN([LSH_CCPIC], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_MSG_CHECKING(CCPIC) +AC_CACHE_VAL(lsh_cv_sys_ccpic,[ + if test -z "$CCPIC" ; then + if test "$GCC" = yes ; then + case "$host_os" in + bsdi4.*) CCPIC="-fPIC" ;; + bsdi*) CCPIC="" ;; + darwin*) CCPIC="-fPIC" ;; + # Could also use -fpic, depending on the number of symbol references + solaris*) CCPIC="-fPIC" ;; + cygwin*) CCPIC="" ;; + mingw32*) CCPIC="" ;; + *) CCPIC="-fpic" ;; + esac + else + case "$host_os" in + darwin*) CCPIC="-fPIC" ;; + irix*) CCPIC="-share" ;; + hpux*) CCPIC="+z"; ;; + *freebsd*) CCPIC="-fpic" ;; + sco*|sysv4.*) CCPIC="-KPIC -dy -Bdynamic" ;; + solaris*) CCPIC="-KPIC -Bdynamic" ;; + winnt*) CCPIC="-shared" ;; + *) CCPIC="" ;; + esac + fi + fi + OLD_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $CCPIC" + AC_TRY_COMPILE([], [exit(0);], + lsh_cv_sys_ccpic="$CCPIC", lsh_cv_sys_ccpic='') + CFLAGS="$OLD_CFLAGS" +]) +CCPIC="$lsh_cv_sys_ccpic" +AC_MSG_RESULT($CCPIC) +AC_SUBST([CCPIC])]) + +dnl LSH_PATH_ADD(path-id, directory) +AC_DEFUN([LSH_PATH_ADD], +[AC_MSG_CHECKING($2) +ac_exists=no +if test -d "$2/." ; then + ac_real_dir=`cd $2 && pwd` + if test -n "$ac_real_dir" ; then + ac_exists=yes + for old in $1_REAL_DIRS ; do + ac_found=no + if test x$ac_real_dir = x$old ; then + ac_found=yes; + break; + fi + done + if test $ac_found = yes ; then + AC_MSG_RESULT(already added) + else + AC_MSG_RESULT(added) + # LDFLAGS="$LDFLAGS -L $2" + $1_REAL_DIRS="$ac_real_dir [$]$1_REAL_DIRS" + $1_DIRS="$2 [$]$1_DIRS" + fi + fi +fi +if test $ac_exists = no ; then + AC_MSG_RESULT(not found) +fi +]) + +dnl LSH_RPATH_ADD(dir) +AC_DEFUN([LSH_RPATH_ADD], [LSH_PATH_ADD(RPATH_CANDIDATE, $1)]) + +dnl LSH_RPATH_INIT(candidates) +AC_DEFUN([LSH_RPATH_INIT], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_MSG_CHECKING([for -R flag]) +RPATHFLAG='' +case "$host_os" in + osf1*) RPATHFLAG="-rpath " ;; + irix6.*|irix5.*) RPATHFLAG="-rpath " ;; + solaris*) + if test "$TCC" = "yes"; then + # tcc doesn't know about -R + RPATHFLAG="-Wl,-R," + else + RPATHFLAG=-R + fi + ;; + linux*) RPATHFLAG="-Wl,-rpath," ;; + *) RPATHFLAG="" ;; +esac + +if test x$RPATHFLAG = x ; then + AC_MSG_RESULT(none) +else + AC_MSG_RESULT([using $RPATHFLAG]) +fi + +RPATH_CANDIDATE_REAL_DIRS='' +RPATH_CANDIDATE_DIRS='' + +AC_MSG_RESULT([Searching for libraries]) + +for d in $1 ; do + LSH_RPATH_ADD($d) +done +]) + +dnl Try to execute a main program, and if it fails, try adding some +dnl -R flag. +dnl LSH_RPATH_FIX +AC_DEFUN([LSH_RPATH_FIX], +[if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then + ac_success=no + AC_TRY_RUN([int main(int argc, char **argv) { return 0; }], + ac_success=yes, ac_success=no, :) + + if test $ac_success = no ; then + AC_MSG_CHECKING([Running simple test program failed. Trying -R flags]) +dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS + ac_remaining_dirs='' + ac_rpath_save_LDFLAGS="$LDFLAGS" + for d in $RPATH_CANDIDATE_DIRS ; do + if test $ac_success = yes ; then + ac_remaining_dirs="$ac_remaining_dirs $d" + else + LDFLAGS="$RPATHFLAG$d $LDFLAGS" +dnl echo LDFLAGS = $LDFLAGS + AC_TRY_RUN([int main(int argc, char **argv) { return 0; }], + [ac_success=yes + ac_rpath_save_LDFLAGS="$LDFLAGS" + AC_MSG_RESULT([adding $RPATHFLAG$d]) + ], + [ac_remaining_dirs="$ac_remaining_dirs $d"], :) + LDFLAGS="$ac_rpath_save_LDFLAGS" + fi + done + RPATH_CANDIDATE_DIRS=$ac_remaining_dirs + fi + if test $ac_success = no ; then + AC_MSG_RESULT(failed) + fi +fi +]) + +dnl Like AC_CHECK_LIB, but uses $KRB_LIBS rather than $LIBS. +dnl LSH_CHECK_KRB_LIB(LIBRARY, FUNCTION, [, ACTION-IF-FOUND [, +dnl ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) + +AC_DEFUN([LSH_CHECK_KRB_LIB], +[AC_CHECK_LIB([$1], [$2], + ifelse([$3], , + [[ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + AC_DEFINE_UNQUOTED($ac_tr_lib) + KRB_LIBS="-l$1 $KRB_LIBS" + ]], [$3]), + ifelse([$4], , , [$4 +])dnl +, [$5 $KRB_LIBS]) +]) + +dnl LSH_LIB_ARGP(ACTION-IF-OK, ACTION-IF-BAD) +AC_DEFUN([LSH_LIB_ARGP], +[ ac_argp_save_LIBS="$LIBS" + ac_argp_save_LDFLAGS="$LDFLAGS" + ac_argp_ok=no + # First check if we can link with argp. + AC_SEARCH_LIBS(argp_parse, argp, + [ LSH_RPATH_FIX + AC_CACHE_CHECK([for working argp], + lsh_cv_lib_argp_works, + [ AC_TRY_RUN( +[#include <argp.h> +#include <stdlib.h> + +static const struct argp_option +options[] = +{ + { NULL, 0, NULL, 0, NULL, 0 } +}; + +struct child_state +{ + int n; +}; + +static error_t +child_parser(int key, char *arg, struct argp_state *state) +{ + struct child_state *input = (struct child_state *) state->input; + + switch(key) + { + default: + return ARGP_ERR_UNKNOWN; + case ARGP_KEY_END: + if (!input->n) + input->n = 1; + break; + } + return 0; +} + +const struct argp child_argp = +{ + options, + child_parser, + NULL, NULL, NULL, NULL, NULL +}; + +struct main_state +{ + struct child_state child; + int m; +}; + +static error_t +main_parser(int key, char *arg, struct argp_state *state) +{ + struct main_state *input = (struct main_state *) state->input; + + switch(key) + { + default: + return ARGP_ERR_UNKNOWN; + case ARGP_KEY_INIT: + state->child_inputs[0] = &input->child; + break; + case ARGP_KEY_END: + if (!input->m) + input->m = input->child.n; + + break; + } + return 0; +} + +static const struct argp_child +main_children[] = +{ + { &child_argp, 0, "", 0 }, + { NULL, 0, NULL, 0} +}; + +static const struct argp +main_argp = +{ options, main_parser, + NULL, + NULL, + main_children, + NULL, NULL +}; + +int main(int argc, char **argv) +{ + struct main_state input = { { 0 }, 0 }; + char *v[2] = { "foo", NULL }; + + argp_parse(&main_argp, 1, v, 0, NULL, &input); + + if ( (input.m == 1) && (input.child.n == 1) ) + return 0; + else + return 1; +} +], lsh_cv_lib_argp_works=yes, + lsh_cv_lib_argp_works=no, + lsh_cv_lib_argp_works=no)]) + + if test x$lsh_cv_lib_argp_works = xyes ; then + ac_argp_ok=yes + else + # Reset link flags + LIBS="$ac_argp_save_LIBS" + LDFLAGS="$ac_argp_save_LDFLAGS" + fi]) + + if test x$ac_argp_ok = xyes ; then + ifelse([$1],, true, [$1]) + else + ifelse([$2],, true, [$2]) + fi +]) + +dnl LSH_GCC_ATTRIBUTES +dnl Check for gcc's __attribute__ construction + +AC_DEFUN([LSH_GCC_ATTRIBUTES], +[AC_CACHE_CHECK(for __attribute__, + lsh_cv_c_attribute, +[ AC_TRY_COMPILE([ +#include <stdlib.h> + +static void foo(void) __attribute__ ((noreturn)); + +static void __attribute__ ((noreturn)) +foo(void) +{ + exit(1); +} +],[], +lsh_cv_c_attribute=yes, +lsh_cv_c_attribute=no)]) + +AH_TEMPLATE([HAVE_GCC_ATTRIBUTE], [Define if the compiler understands __attribute__]) +if test "x$lsh_cv_c_attribute" = "xyes"; then + AC_DEFINE(HAVE_GCC_ATTRIBUTE) +fi + +AH_BOTTOM( +[#if __GNUC__ && HAVE_GCC_ATTRIBUTE +# define NORETURN __attribute__ ((__noreturn__)) +# define PRINTF_STYLE(f, a) __attribute__ ((__format__ (__printf__, f, a))) +# define UNUSED __attribute__ ((__unused__)) +#else +# define NORETURN +# define PRINTF_STYLE(f, a) +# define UNUSED +#endif +])]) + +# Check for alloca, and include the standard blurb in config.h +AC_DEFUN([LSH_FUNC_ALLOCA], +[AC_FUNC_ALLOCA +AC_CHECK_HEADERS([malloc.h]) +AH_BOTTOM( +[/* AIX requires this to be the first thing in the file. */ +#ifndef __GNUC__ +# if HAVE_ALLOCA_H +# include <alloca.h> +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +/* Needed for alloca on windows */ +# if HAVE_MALLOC_H +# include <malloc.h> +# endif +# endif +#else /* defined __GNUC__ */ +# if HAVE_ALLOCA_H +# include <alloca.h> +# endif +#endif +])]) + +AC_DEFUN([LSH_FUNC_STRERROR], +[AC_CHECK_FUNCS(strerror) +AH_BOTTOM( +[#if HAVE_STRERROR +#define STRERROR strerror +#else +#define STRERROR(x) (sys_errlist[x]) +#endif +])]) + +AC_DEFUN([LSH_FUNC_STRSIGNAL], +[AC_CHECK_FUNCS(strsignal) +AC_CHECK_DECLS([sys_siglist, _sys_siglist]) +AH_BOTTOM( +[#if HAVE_STRSIGNAL +# define STRSIGNAL strsignal +#else /* !HAVE_STRSIGNAL */ +# if HAVE_DECL_SYS_SIGLIST +# define STRSIGNAL(x) (sys_siglist[x]) +# else +# if HAVE_DECL__SYS_SIGLIST +# define STRSIGNAL(x) (_sys_siglist[x]) +# else +# define STRSIGNAL(x) "Unknown signal" +# if __GNUC__ +# warning Using dummy STRSIGNAL +# endif +# endif +# endif +#endif /* !HAVE_STRSIGNAL */ +])]) + +dnl LSH_MAKE_CONDITIONAL(symbol, test) +AC_DEFUN([LSH_MAKE_CONDITIONAL], +[if $2 ; then + IF_$1='' + UNLESS_$1='# ' +else + IF_$1='# ' + UNLESS_$1='' +fi +AC_SUBST(IF_$1) +AC_SUBST(UNLESS_$1)]) + +dnl LSH_DEPENDENCY_TRACKING + +dnl Defines compiler flags DEP_FLAGS to generate dependency +dnl information, and DEP_PROCESS that is any shell commands needed for +dnl massaging the dependency information further. Dependencies are +dnl generated as a side effect of compilation. Dependency files +dnl themselves are not treated as targets. + +AC_DEFUN([LSH_DEPENDENCY_TRACKING], +[AC_ARG_ENABLE(dependency_tracking, + AC_HELP_STRING([--disable-dependency-tracking], + [Disable dependency tracking. Dependency tracking doesn't work with BSD make]),, + [enable_dependency_tracking=yes]) + +DEP_FLAGS='' +DEP_PROCESS='true' +if test x$enable_dependency_tracking = xyes ; then + if test x$GCC = xyes ; then + gcc_version=`gcc --version | head -1` + case "$gcc_version" in + 2.*|*[[!0-9.]]2.*) + enable_dependency_tracking=no + AC_MSG_WARN([Dependency tracking disabled, gcc-3.x is needed]) + ;; + *) + DEP_FLAGS='-MT $[]@ -MD -MP -MF $[]@.d' + DEP_PROCESS='true' + ;; + esac + else + enable_dependency_tracking=no + AC_MSG_WARN([Dependency tracking disabled]) + fi +fi + +if test x$enable_dependency_tracking = xyes ; then + DEP_INCLUDE='include ' +else + DEP_INCLUDE='# ' +fi + +AC_SUBST([DEP_INCLUDE]) +AC_SUBST([DEP_FLAGS]) +AC_SUBST([DEP_PROCESS])]) + +dnl GMP_TRY_ASSEMBLE(asm-code,[action-success][,action-fail]) +dnl ---------------------------------------------------------- +dnl Attempt to assemble the given code. +dnl Do "action-success" if this succeeds, "action-fail" if not. +dnl +dnl conftest.o and conftest.out are available for inspection in +dnl "action-success". If either action does a "break" out of a loop then +dnl an explicit "rm -f conftest*" will be necessary. +dnl +dnl This is not unlike AC_TRY_COMPILE, but there's no default includes or +dnl anything in "asm-code", everything wanted must be given explicitly. + +AC_DEFUN([GMP_TRY_ASSEMBLE], +[cat >conftest.s <<EOF +[$1] +EOF +gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" +if AC_TRY_EVAL(gmp_assemble); then + cat conftest.out >&AC_FD_CC + ifelse([$2],,:,[$2]) +else + cat conftest.out >&AC_FD_CC + echo "configure: failed program was:" >&AC_FD_CC + cat conftest.s >&AC_FD_CC + ifelse([$3],,:,[$3]) +fi +rm -f conftest* +]) + +dnl @synopsis AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])] +dnl +dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the +dnl existence of an include file <stdint.h> that defines a set of +dnl typedefs, especially uint8_t,int32_t,uintptr_t. +dnl Many older installations will not provide this file, but some will +dnl have the very same definitions in <inttypes.h>. In other enviroments +dnl we can use the inet-types in <sys/types.h> which would define the +dnl typedefs int8_t and u_int8_t respectivly. +dnl +dnl This macros will create a local "_stdint.h" or the headerfile given as +dnl an argument. In many cases that file will just "#include <stdint.h>" +dnl or "#include <inttypes.h>", while in other environments it will provide +dnl the set of basic 'stdint's definitions/typedefs: +dnl int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t +dnl int_least32_t.. int_fast32_t.. intmax_t +dnl which may or may not rely on the definitions of other files, +dnl or using the AC_CHECK_SIZEOF macro to determine the actual +dnl sizeof each type. +dnl +dnl if your header files require the stdint-types you will want to create an +dnl installable file mylib-int.h that all your other installable header +dnl may include. So if you have a library package named "mylib", just use +dnl AX_CREATE_STDINT_H(mylib-int.h) +dnl in configure.ac and go to install that very header file in Makefile.am +dnl along with the other headers (mylib.h) - and the mylib-specific headers +dnl can simply use "#include <mylib-int.h>" to obtain the stdint-types. +dnl +dnl Remember, if the system already had a valid <stdint.h>, the generated +dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things... +dnl +dnl @, (status: used on new platforms) (see http://ac-archive.sf.net/gstdint/) +dnl @version $Id: aclocal.m4,v 1.1 2007/05/03 20:49:15 nisse Exp $ +dnl @author Guido Draheim <[email protected]> + +AC_DEFUN([AX_CREATE_STDINT_H], +[# ------ AX CREATE STDINT H ------------------------------------- +AC_MSG_CHECKING([for stdint types]) +ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)` +# try to shortcircuit - if the default include path of the compiler +# can find a "stdint.h" header then we assume that all compilers can. +AC_CACHE_VAL([ac_cv_header_stdint_t],[ +old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" +old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" +old_CFLAGS="$CFLAGS" ; CFLAGS="" +AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;], +[ac_cv_stdint_result="(assuming C99 compatible system)" + ac_cv_header_stdint_t="stdint.h"; ], +[ac_cv_header_stdint_t=""]) +CXXFLAGS="$old_CXXFLAGS" +CPPFLAGS="$old_CPPFLAGS" +CFLAGS="$old_CFLAGS" ]) + +v="... $ac_cv_header_stdint_h" +if test "$ac_stdint_h" = "stdint.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)]) +elif test "$ac_stdint_h" = "inttypes.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)]) +elif test "_$ac_cv_header_stdint_t" = "_" ; then + AC_MSG_RESULT([(putting them into $ac_stdint_h)$v]) +else + ac_cv_header_stdint="$ac_cv_header_stdint_t" + AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)]) +fi + +if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. + +dnl .....intro message done, now do a few system checks..... +dnl btw, all CHECK_TYPE macros do automatically "DEFINE" a type, therefore +dnl we use the autoconf implementation detail _AC CHECK_TYPE_NEW instead + +inttype_headers=`echo $2 | sed -e 's/,/ /g'` + +ac_cv_stdint_result="(no helpful system typedefs seen)" +AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[ + ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) + AC_MSG_RESULT([(..)]) + for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ; do + unset ac_cv_type_uintptr_t + unset ac_cv_type_uint64_t + _AC_CHECK_TYPE_NEW(uintptr_t,[ac_cv_header_stdint_x=$i],dnl + continue,[#include <$i>]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" + break; + done + AC_MSG_CHECKING([for stdint uintptr_t]) + ]) + +if test "_$ac_cv_header_stdint_x" = "_" ; then +AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[ + ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) + AC_MSG_RESULT([(..)]) + for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ; do + unset ac_cv_type_uint32_t + unset ac_cv_type_uint64_t + AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],dnl + continue,[#include <$i>]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + ac_cv_stdint_result="(seen uint32_t$and64 in $i)" + break; + done + AC_MSG_CHECKING([for stdint uint32_t]) + ]) +fi + +if test "_$ac_cv_header_stdint_x" = "_" ; then +if test "_$ac_cv_header_stdint_o" = "_" ; then +AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[ + ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) + AC_MSG_RESULT([(..)]) + for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do + unset ac_cv_type_u_int32_t + unset ac_cv_type_u_int64_t + AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],dnl + continue,[#include <$i>]) + AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>]) + ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" + break; + done + AC_MSG_CHECKING([for stdint u_int32_t]) + ]) +fi fi + +dnl if there was no good C99 header file, do some typedef checks... +if test "_$ac_cv_header_stdint_x" = "_" ; then + AC_MSG_CHECKING([for stdint datatype model]) + AC_MSG_RESULT([(..)]) + AC_CHECK_SIZEOF(char) + AC_CHECK_SIZEOF(short) + AC_CHECK_SIZEOF(int) + AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(void*) + ac_cv_stdint_char_model="" + ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_char" + ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_short" + ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_int" + ac_cv_stdint_long_model="" + ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_int" + ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_long" + ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_voidp" + name="$ac_cv_stdint_long_model" + case "$ac_cv_stdint_char_model/$ac_cv_stdint_long_model" in + 122/242) name="$name, IP16 (standard 16bit machine)" ;; + 122/244) name="$name, LP32 (standard 32bit mac/win)" ;; + 122/*) name="$name (unusual int16 model)" ;; + 124/444) name="$name, ILP32 (standard 32bit unixish)" ;; + 124/488) name="$name, LP64 (standard 64bit unixish)" ;; + 124/448) name="$name, LLP64 (unusual 64bit unixish)" ;; + 124/*) name="$name (unusual int32 model)" ;; + 128/888) name="$name, ILP64 (unusual 64bit numeric)" ;; + 128/*) name="$name (unusual int64 model)" ;; + 222/*|444/*) name="$name (unusual dsptype)" ;; + *) name="$name (very unusal model)" ;; + esac + AC_MSG_RESULT([combined for stdint datatype model... $name]) +fi + +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_x" +elif test "_$ac_cv_header_stdint_o" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_o" +elif test "_$ac_cv_header_stdint_u" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_u" +else + ac_cv_header_stdint="stddef.h" +fi + +AC_MSG_CHECKING([for extra inttypes in chosen header]) +AC_MSG_RESULT([($ac_cv_header_stdint)]) +dnl see if int_least and int_fast types are present in _this_ header. +unset ac_cv_type_int_least32_t +unset ac_cv_type_int_fast32_t +AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>]) +AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>]) +AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>]) + +fi # shortcircut to system "stdint.h" +# ------------------ PREPARE VARIABLES ------------------------------ +if test "$GCC" = "yes" ; then +ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` +else +ac_cv_stdint_message="using $CC" +fi + +AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl +$ac_cv_stdint_result]) + +# ----------------- DONE inttypes.h checks START header ------------- +AC_CONFIG_COMMANDS([$ac_stdint_h],[ +AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h) +ac_stdint=$tmp/_stdint.h + +echo "#ifndef" $_ac_stdint_h >$ac_stdint +echo "#define" $_ac_stdint_h "1" >>$ac_stdint +echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint +echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint +echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint +if test "_$ac_cv_header_stdint_t" != "_" ; then +echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint +fi + +cat >>$ac_stdint <<STDINT_EOF + +/* ................... shortcircuit part ........................... */ + +#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H +#include <stdint.h> +#else +#include <stddef.h> + +/* .................... configured part ............................ */ + +STDINT_EOF + +echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_header="$ac_cv_header_stdint_x" + echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint +fi + +echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_o" != "_" ; then + ac_header="$ac_cv_header_stdint_o" + echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint +fi + +echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint +if test "_$ac_cv_header_stdint_u" != "_" ; then + ac_header="$ac_cv_header_stdint_u" + echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint +fi + +echo "" >>$ac_stdint + +if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then + echo "#include <$ac_header>" >>$ac_stdint + echo "" >>$ac_stdint +fi fi + +echo "/* which 64bit typedef has been found */" >>$ac_stdint +if test "$ac_cv_type_uint64_t" = "yes" ; then +echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint +fi +if test "$ac_cv_type_u_int64_t" = "yes" ; then +echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* which type model has been detected */" >>$ac_stdint +if test "_$ac_cv_stdint_char_model" != "_" ; then +echo "#define _STDINT_CHAR_MODEL" "$ac_cv_stdint_char_model" >>$ac_stdint +echo "#define _STDINT_LONG_MODEL" "$ac_cv_stdint_long_model" >>$ac_stdint +else +echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint +echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* whether int_least types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_least32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint +fi +echo "/* whether int_fast types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_fast32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint +fi +echo "/* whether intmax_t type was detected */" >>$ac_stdint +if test "$ac_cv_type_intmax_t" = "yes"; then +echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + + cat >>$ac_stdint <<STDINT_EOF +/* .................... detections part ............................ */ + +/* whether we need to define bitspecific types from compiler base types */ +#ifndef _STDINT_HEADER_INTPTR +#ifndef _STDINT_HEADER_UINT32 +#ifndef _STDINT_HEADER_U_INT32 +#define _STDINT_NEED_INT_MODEL_T +#else +#define _STDINT_HAVE_U_INT_TYPES +#endif +#endif +#endif + +#ifdef _STDINT_HAVE_U_INT_TYPES +#undef _STDINT_NEED_INT_MODEL_T +#endif + +#ifdef _STDINT_CHAR_MODEL +#if _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124 +#ifndef _STDINT_BYTE_MODEL +#define _STDINT_BYTE_MODEL 12 +#endif +#endif +#endif + +#ifndef _STDINT_HAVE_INT_LEAST32_T +#define _STDINT_NEED_INT_LEAST_T +#endif + +#ifndef _STDINT_HAVE_INT_FAST32_T +#define _STDINT_NEED_INT_FAST_T +#endif + +#ifndef _STDINT_HEADER_INTPTR +#define _STDINT_NEED_INTPTR_T +#ifndef _STDINT_HAVE_INTMAX_T +#define _STDINT_NEED_INTMAX_T +#endif +#endif + + +/* .................... definition part ............................ */ + +/* some system headers have good uint64_t */ +#ifndef _HAVE_UINT64_T +#if defined _STDINT_HAVE_UINT64_T || defined HAVE_UINT64_T +#define _HAVE_UINT64_T +#elif defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T +#define _HAVE_UINT64_T +typedef u_int64_t uint64_t; +#endif +#endif + +#ifndef _HAVE_UINT64_T +/* .. here are some common heuristics using compiler runtime specifics */ +#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L +#define _HAVE_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; + +#elif !defined __STRICT_ANSI__ +#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ +#define _HAVE_UINT64_T +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; + +#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__ +/* note: all ELF-systems seem to have loff-support which needs 64-bit */ +#if !defined _NO_LONGLONG +#define _HAVE_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; +#endif + +#elif defined __alpha || (defined __mips && defined _ABIN32) +#if !defined _NO_LONGLONG +typedef long int64_t; +typedef unsigned long uint64_t; +#endif + /* compiler/cpu type to define int64_t */ +#endif +#endif +#endif + +#if defined _STDINT_HAVE_U_INT_TYPES +/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */ +typedef u_int8_t uint8_t; +typedef u_int16_t uint16_t; +typedef u_int32_t uint32_t; + +/* glibc compatibility */ +#ifndef __int8_t_defined +#define __int8_t_defined +#endif +#endif + +#ifdef _STDINT_NEED_INT_MODEL_T +/* we must guess all the basic types. Apart from byte-adressable system, */ +/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */ +/* (btw, those nibble-addressable systems are way off, or so we assume) */ + +dnl /* have a look at "64bit and data size neutrality" at */ +dnl /* http://unix.org/version2/whatsnew/login_64bit.html */ +dnl /* (the shorthand "ILP" types always have a "P" part) */ + +#if defined _STDINT_BYTE_MODEL +#if _STDINT_LONG_MODEL+0 == 242 +/* 2:4:2 = IP16 = a normal 16-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned long uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef long int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444 +/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */ +/* 4:4:4 = ILP32 = a normal 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488 +/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */ +/* 4:8:8 = LP64 = a normal 64-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* this system has a "long" of 64bit */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +typedef unsigned long uint64_t; +typedef long int64_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 448 +/* LLP64 a 64-bit system derived from a 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* assuming the system has a "long long" */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +typedef unsigned long long uint64_t; +typedef long long int64_t; +#endif +#else +#define _STDINT_NO_INT32_T +#endif +#else +#define _STDINT_NO_INT8_T +#define _STDINT_NO_INT32_T +#endif +#endif + +/* + * quote from SunOS-5.8 sys/inttypes.h: + * Use at your own risk. As of February 1996, the committee is squarely + * behind the fixed sized types; the "least" and "fast" types are still being + * discussed. The probability that the "fast" types may be removed before + * the standard is finalized is high enough that they are not currently + * implemented. + */ + +#if defined _STDINT_NEED_INT_LEAST_T +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_least64_t; +#endif + +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_least64_t; +#endif + /* least types */ +#endif + +#if defined _STDINT_NEED_INT_FAST_T +typedef int8_t int_fast8_t; +typedef int int_fast16_t; +typedef int32_t int_fast32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_fast64_t; +#endif + +typedef uint8_t uint_fast8_t; +typedef unsigned uint_fast16_t; +typedef uint32_t uint_fast32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_fast64_t; +#endif + /* fast types */ +#endif + +#ifdef _STDINT_NEED_INTMAX_T +#ifdef _HAVE_UINT64_T +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; +#else +typedef long intmax_t; +typedef unsigned long uintmax_t; +#endif +#endif + +#ifdef _STDINT_NEED_INTPTR_T +#ifndef __intptr_t_defined +#define __intptr_t_defined +/* we encourage using "long" to store pointer values, never use "int" ! */ +#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484 +typedef unsinged int uintptr_t; +typedef int intptr_t; +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444 +typedef unsigned long uintptr_t; +typedef long intptr_t; +#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; +#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */ +typedef unsigned long uintptr_t; +typedef long intptr_t; +#endif +#endif +#endif + + /* shortcircuit*/ +#endif + /* once */ +#endif +#endif +STDINT_EOF + if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then + AC_MSG_NOTICE([$ac_stdint_h is unchanged]) + else + ac_dir=`AS_DIRNAME(["$ac_stdint_h"])` + AS_MKDIR_P(["$ac_dir"]) + rm -f $ac_stdint_h + mv $ac_stdint $ac_stdint_h + fi +],[# variables for create stdint.h replacement +PACKAGE="$PACKAGE" +VERSION="$VERSION" +ac_stdint_h="$ac_stdint_h" +_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h) +ac_cv_stdint_message="$ac_cv_stdint_message" +ac_cv_header_stdint_t="$ac_cv_header_stdint_t" +ac_cv_header_stdint_x="$ac_cv_header_stdint_x" +ac_cv_header_stdint_o="$ac_cv_header_stdint_o" +ac_cv_header_stdint_u="$ac_cv_header_stdint_u" +ac_cv_type_uint64_t="$ac_cv_type_uint64_t" +ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" +ac_cv_stdint_char_model="$ac_cv_stdint_char_model" +ac_cv_stdint_long_model="$ac_cv_stdint_long_model" +ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" +ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" +ac_cv_type_intmax_t="$ac_cv_type_intmax_t" +]) +])
meta/recipes-support/nettle/nettle_2.1.bb new file +31 -0
@@ -0,0 +1,31 @@ +DESCRIPTION = "Low level cryptographic library" +HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/nettle.html" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS += "gmp" + +PR = "r0" + +SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \ + file://acinclude.m4 \ + " + +do_configure_prepend() { + cp ${WORKDIR}/acinclude.m4 ${S}/ +} + +EXTRA_OECONF =+ "--enable-shared" + +SRC_URI[md5sum] = "2bfaf16234a5d8deb96cd23f53a682bb" +SRC_URI[sha256sum] = "b7d26b3e38842d83c02f807ea7a2cbaa6e2d8f22e5fb20d97ab7a171d039d74e" + +inherit autotools + +BBCLASSEXTEND = "native" + +PACKAGES =+ "libnettle libhogweed" +FILES_libnettle = "${libdir}/libnettle.so.*" +FILES_libhogweed = "${libdir}/libhogweed.so.*"
Signature · 1 line
1.7.0
Re: [PATCH 09/10] lzo: upgrade to version 2.05
In reply to Qing HeQuoted 3 lines · Qing He
From: Qing He<[email protected]>
from 2.04
what changed in the LICESNE Files, maybe just the date, but when I see that those files have changed it raises a flag for me, so please update the comment for this to indicate what changed.
Thanks
Sau!
Quoted 68 lines
Signed-off-by Qing He<[email protected]>--- .../lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 | 0 .../lzo/{lzo-2.04 => lzo-2.05}/autoconf.patch | 4 +++- .../lzo/{lzo_2.04.bb => lzo_2.05.bb} | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-)rename meta/recipes-support/lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 (100%) rename meta/recipes-support/lzo/{lzo-2.04 =>
lzo-2.05}/autoconf.patch(84%) rename meta/recipes-support/lzo/{lzo_2.04.bb => lzo_2.05.bb} (59%)meta/recipes-support/lzo/lzo-2.05/acinclude.m4 renamed from meta/recipes-support/lzo/lzo-2.04/acinclude.m4 +0
-0meta/recipes-support/lzo/lzo-2.05/autoconf.patch renamed from meta/recipes-support/lzo/lzo-2.04/autoconf.patch +3
-1@@ -2,6 +2,8 @@ Date: 12/31/2010 Didn't find 2.67 specific features, so lower the requirement to pass build +Upstream-Status: Inappropriate [workaround] + Signed-off-by: Qing He<[email protected]> --- diff --git a/configure.ac b/configure.ac@@ -14,6 +16,6 @@ index 650749a..2a78845 100644 -AC_PREREQ(2.67) +AC_PREREQ(2.65) - AC_INIT([LZO],[2.04],[[email protected]],[lzo],[http://www.oberhumer.com/opensource/lzo/]) + AC_INIT([LZO],[2.05],[[email protected]],[lzo],[http://www.oberhumer.com/opensource/lzo/]) AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION]) AC_CONFIG_SRCDIR(src/lzo_init.c)meta/recipes-support/lzo/lzo_2.05.bb renamed from meta/recipes-support/lzo/lzo_2.04.bb +4
-4@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8cad52263e636e25377bc18420118101 \ - file://src/lzo_init.c;beginline=5;endline=36;md5=454f781644dfe945e3634a9b699e91f3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://src/lzo_init.c;beginline=23;endline=40;md5=924a0f71f5394f6d404be3b458474769" PR = "r0" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \@@ -12,8 +12,8 @@ SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ file://acinclude.m4 \ " -SRC_URI[md5sum] = "a383c7055a310e2a71b9ecd19cfea238" -SRC_URI[sha256sum] = "4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428" +SRC_URI[md5sum] = "c67cda5fa191bab761c7cb06fe091e36" +SRC_URI[sha256sum] = "449f98186d76ba252cd17ff1241ca2a96b7f62e0d3e4766f88730dab0ea5f333" inherit autotools
Re: [PATCH 01/10] attr: upgrade to version 2.4.46
In reply to Qing HeQuoted 6 lines · Qing He
From: Qing He<[email protected]>
from 2.4.44
- remove the backported patch that is now in the tarball
- prog path issue has also been fixed in the upstream
Qing,
I noticed that there is a recipes-support/attr/files/relative-libdir.patch patch that has not had it's Upstream-Status added, please add this.
Thanks
Sau!
Quoted 325 lines
Signed-off-by Qing He<[email protected]>--- .../attr/attr-2.4.44/double-free.patch | 18 ---- .../attr/attr-2.4.44/memory-leak-in-copy.patch | 50 ---------- .../attr/attr-2.4.44/memory-leak2.patch | 18 ---- .../attr/attr-2.4.44/pull-in-string.h.patch | 21 ---- .../attr/attr-2.4.44/thinko-in-restore.patch | 19 ---- meta/recipes-support/attr/attr_2.4.44.bb | 12 --- meta/recipes-support/attr/attr_2.4.46.bb | 6 + meta/recipes-support/attr/ea-acl.inc | 2 +- .../attr/files/no-fixed-prog-path.patch | 99 -------------------- 9 files changed, 7 insertions(+), 238 deletions(-)delete mode 100644
meta/recipes-support/attr/attr-2.4.44/double-free.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/memory-leak2.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patchdelete mode 100644 meta/recipes-support/attr/attr_2.4.44.bb
create mode 100644 meta/recipes-support/attr/attr_2.4.46.bb
delete mode 100644meta/recipes-support/attr/files/no-fixed-prog-path.patchmeta/recipes-support/attr/attr-2.4.44/double-free.patch deleted +0
-18@@ -1,18 +0,0 @@ -commit 5b28eb3b0e0430ce6af28edc9100ca23299d1218 -Author: Kamil Dudka<[email protected]> -Date: Thu Jun 3 15:29:54 2010 +0200 - - attr_parse_attr_conf: eliminate a double free - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index 030bbf5..2697328 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -81,6 +81,7 @@ repeat: - fclose(file); - file = NULL; - free(text); -+ text = NULL; - size_guess *= 2; - goto repeat; - }meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch deleted +0
-50@@ -1,50 +0,0 @@ -commit 972b42a67393f762936e74d3ce929914181f5f28 -Author: Brandon Philips<[email protected]> -Date: Thu Dec 17 17:15:57 2009 -0800 - - libattr: fix memory leak in attr_copy_action() - - stanse found that attr_copy_action returns before freeing the memory - allocated for text. - - Move fopen() above the malloc so this is not a problem. - - Fixes this bug: - https://bugzilla.novell.com/show_bug.cgi?id=564735 - - Signed-off-by: Brandon Philips<[email protected]> - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index 0d7aca5..dc94224 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -53,7 +53,7 @@ free_attr_actions(void) - static int - attr_parse_attr_conf(struct error_context *ctx) - { -- char *text, *t; -+ char *text = NULL, *t; - size_t size_guess = 4096, len; - FILE *file; - char *pattern = NULL; -@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_context *ctx) - return 0; - - repeat: -- text = malloc(size_guess + 1); -- if (!text) -- goto fail; -- - if ((file = fopen(ATTR_CONF, "r")) == NULL) { - if (errno == ENOENT) - return 0; - goto fail; - } -+ -+ text = malloc(size_guess + 1); -+ if (!text) -+ goto fail; -+ - len = fread(text, 1, size_guess, file); - if (ferror(file)) - goto fail;meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch deleted +0
-18@@ -1,18 +0,0 @@ -commit 42f50a130d144ffbc01738f15da9d4f1b57505bd -Author: Kamil Dudka<[email protected]> -Date: Thu Jun 3 15:23:04 2010 +0200 - - attr_parse_attr_conf: eliminate a memory leak - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index dc94224..030bbf5 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -129,6 +129,7 @@ repeat: - - t += strcspn(t, "\n"); - } -+ free(text); - return 0; - - parse_error:meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch deleted +0
-21@@ -1,21 +0,0 @@ -commit 235cdd2af498d288f1af1142e7a23fbd16dff907 -Author: Mike Frysinger<[email protected]> -Date: Fri Jan 8 21:53:19 2010 -0500 - - quote: pull in string.h for strchr prototype - - Signed-off-by: Mike Frysinger<[email protected]> - Signed-off-by: Brandon Philips<[email protected]> - -diff --git a/libmisc/quote.c b/libmisc/quote.c -index f98c887..bf8f9eb 100644 ---- a/libmisc/quote.c -+++ b/libmisc/quote.c -@@ -20,6 +20,7 @@ - #include<stdio.h> - #include<stdlib.h> - #include<ctype.h> -+#include<string.h> - #include "misc.h" - - const char *quote(const char *str, const char *quote_chars)meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch deleted +0
-19@@ -1,19 +0,0 @@ -commit e8d568c696692eed5c92d5a35498e1c26e13d6b3 -Author: Kamil Dudka<[email protected]> -Date: Thu Jun 3 15:30:19 2010 +0200 - - setfattr.c: fix thinko in restore() - -diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c -index 491c25a..0a14cfa 100644 ---- a/setfattr/setfattr.c -+++ b/setfattr/setfattr.c -@@ -120,7 +120,7 @@ int restore(const char *filename) - break; - line++; - if (strncmp(l, "# file: ", 8) != 0) { -- if (filename) { -+ if (file != stdin) { - fprintf(stderr, _("%s: %s: No filename found " - "in line %d, aborting\n"), - progname, filename, backup_line);meta/recipes-support/attr/attr_2.4.44.bb deleted +0
-12@@ -1,12 +0,0 @@ -require attr.inc - -PR = "r3" - -SRC_URI += "file://memory-leak-in-copy.patch \ - file://memory-leak2.patch \ - file://double-free.patch \ - file://pull-in-string.h.patch \ - file://thinko-in-restore.patch" - -SRC_URI[md5sum] = "d132c119831c27350e10b9f885711adc" -SRC_URI[sha256sum] = "9f6214b8e53f4bba651ac5a72c0f6193b12aa21fbf1d675d89a7b4bc45264498"meta/recipes-support/attr/attr_2.4.46.bb new file +6
-0@@ -0,0 +1,6 @@ +require attr.inc + +PR = "r0" + +SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010" +SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"meta/recipes-support/attr/ea-acl.inc +1
-1@@ -1,7 +1,7 @@ # this build system is mostly shared by attr and acl SRC_URI += "file://relative-libdir.patch;striplevel=0 \ - file://no-fixed-prog-path.patch" + " inherit autotools gettextmeta/recipes-support/attr/files/no-fixed-prog-path.patch deleted +0
-99@@ -1,99 +0,0 @@ -Not using fixed utility path, but respect $PATH - -10/09/2010 - created by Qing He<[email protected]> - -diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4 -index 165db35..0afe578 100644 ---- a/m4/package_utilies.m4 -+++ b/m4/package_utilies.m4 -@@ -37,22 +37,22 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], - AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) - - if test -z "$MAKE"; then -- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(MAKE, gmake) - fi - if test -z "$MAKE"; then -- AC_PATH_PROG(MAKE, make,, /usr/bin) -+ AC_PATH_PROG(MAKE, make) - fi - make=$MAKE - AC_SUBST(make) - AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) - - if test -z "$TAR"; then -- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) -+ AC_PATH_PROG(TAR, tar) - fi - tar=$TAR - AC_SUBST(tar) - if test -z "$ZIP"; then -- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(ZIP, gzip) - fi - - zip=$ZIP -@@ -65,25 +65,25 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], - AC_SUBST(makedepend) - - if test -z "$AWK"; then -- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) -+ AC_PATH_PROG(AWK, awk) - fi - awk=$AWK - AC_SUBST(awk) - - if test -z "$SED"; then -- AC_PATH_PROG(SED, sed,, /bin:/usr/bin) -+ AC_PATH_PROG(SED, sed) - fi - sed=$SED - AC_SUBST(sed) - - if test -z "$ECHO"; then -- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) -+ AC_PATH_PROG(ECHO, echo) - fi - echo=$ECHO - AC_SUBST(echo) - - if test -z "$SORT"; then -- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) -+ AC_PATH_PROG(SORT, sort) - fi - sort=$SORT - AC_SUBST(sort) -@@ -93,21 +93,21 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], - - if test "$enable_gettext" = yes; then - if test -z "$MSGFMT"; then -- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(MSGFMT, msgfmt) - fi - msgfmt=$MSGFMT - AC_SUBST(msgfmt) - AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) - - if test -z "$MSGMERGE"; then -- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(MSGMERGE, msgmerge) - fi - msgmerge=$MSGMERGE - AC_SUBST(msgmerge) - AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext) - - if test -z "$XGETTEXT"; then -- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(XGETTEXT, xgettext) - fi - xgettext=$XGETTEXT - AC_SUBST(xgettext) -@@ -117,7 +117,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], - fi - - if test -z "$RPM"; then -- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) -+ AC_PATH_PROG(RPM, rpm) - fi - rpm=$RPM - AC_SUBST(rpm)
Quoted 6 lines · Qing He
From: Qing He<[email protected]>
upgraded 9 recipes
add 1: nettle as the new dependency of gnutls
Qing,
I noticed that there are a number of recipes below that you updated, but did not update their patches. Please update all patches to contain the Upstream-Status: information.
I will a look for an updated pull request early next week.
Thanks
Sau!
Quoted 108 lines
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: qhe/upgrade
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/upgradeThanks,
Qing He<[email protected]>
---Qing He (10):
attr: upgrade to version 2.4.46
acl: upgrade to version 2.2.51
augeas: upgrade to version 0.8.1
curl: upgrade to version 7.21.6
busybox: upgrade to version 1.18.4
nettle: add new recipe
gnutls: upgrade to version 2.12.3
shared-mime-info: upgrade to version 0.90
lzo: upgrade to version 2.05
libcap: upgrade to version 2.20.../busybox/busybox-1.17.3/make-382-fix.patch | 25 - .../B921600.patch | 0 .../busybox-appletlib-dependency.patch | 0 .../busybox-udhcpc-no_deconfig.patch | 19 +- .../{busybox-1.17.3 => busybox-1.18.4}/defconfig | 0 .../get_header_tar.patch | 4 +- .../run-parts.in.usr-bin.patch | 0 .../udhcpc-fix-nfsroot.patch | 0 .../udhcpscript.patch | 0 .../{busybox_1.17.3.bb => busybox_1.18.4.bb} | 7 +- meta/recipes-extended/augeas/augeas_0.7.4.bb | 6 - meta/recipes-extended/augeas/augeas_0.8.1.bb | 6 + meta/recipes-support/attr/acl_2.2.49.bb | 6 - meta/recipes-support/attr/acl_2.2.51.bb | 6 + .../attr/attr-2.4.44/double-free.patch | 18 - .../attr/attr-2.4.44/memory-leak-in-copy.patch | 50 - .../attr/attr-2.4.44/memory-leak2.patch | 18 - .../attr/attr-2.4.44/pull-in-string.h.patch | 21 - .../attr/attr-2.4.44/thinko-in-restore.patch | 19 - meta/recipes-support/attr/attr_2.4.44.bb | 12 - meta/recipes-support/attr/attr_2.4.46.bb | 6 + meta/recipes-support/attr/ea-acl.inc | 2 +- .../attr/files/no-fixed-prog-path.patch | 99 -- meta/recipes-support/curl/curl/noldlibpath.patch | 2 + meta/recipes-support/curl/curl/pkgconfig_fix.patch | 5 +- .../curl/{curl_7.21.2.bb => curl_7.21.6.bb} | 6 +- .../gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch | 16 - .../configure-fix.patch | 14 +- .../gnutls-openssl.patch | 2 + meta/recipes-support/gnutls/gnutls_2.10.4.bb | 10 - meta/recipes-support/gnutls/gnutls_2.12.3.bb | 11 + meta/recipes-support/libcap/libcap.inc | 2 +- meta/recipes-support/libcap/libcap_2.19.bb | 6 - meta/recipes-support/libcap/libcap_2.20.bb | 6 + .../lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 | 0 .../lzo/{lzo-2.04 => lzo-2.05}/autoconf.patch | 4 +- .../lzo/{lzo_2.04.bb => lzo_2.05.bb} | 8 +- meta/recipes-support/nettle/files/acinclude.m4 | 1062 ++++++++++++++++++++ meta/recipes-support/nettle/nettle_2.1.bb | 31 + .../files/fix-parallel-build.patch | 33 + .../shared-mime-info/shared-mime-info_0.80.bb | 5 - .../shared-mime-info/shared-mime-info_0.90.bb | 7 + 42 files changed, 1208 insertions(+), 346 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/B921600.patch (100%) rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/busybox-appletlib-dependency.patch (100%) rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/busybox-udhcpc-no_deconfig.patch (90%) rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/defconfig (100%) rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/get_header_tar.patch (76%) rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/run-parts.in.usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/udhcpc-fix-nfsroot.patch (100%) rename meta/recipes-core/busybox/{busybox-1.17.3 => busybox-1.18.4}/udhcpscript.patch (100%)rename meta/recipes-core/busybox/{busybox_1.17.3.bb => busybox_1.18.4.bb} (81%) delete mode 100644 meta/recipes-extended/augeas/augeas_0.7.4.bb
create mode 100644 meta/recipes-extended/augeas/augeas_0.8.1.bb
delete mode 100644 meta/recipes-support/attr/acl_2.2.49.bb
create mode 100644 meta/recipes-support/attr/acl_2.2.51.bb
delete mode 100644meta/recipes-support/attr/attr-2.4.44/double-free.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/memory-leak2.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patchdelete mode 100644meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patchdelete mode 100644 meta/recipes-support/attr/attr_2.4.44.bb
create mode 100644 meta/recipes-support/attr/attr_2.4.46.bb
delete mode 100644meta/recipes-support/attr/files/no-fixed-prog-path.patchrename meta/recipes-support/curl/{curl_7.21.2.bb => curl_7.21.6.bb} (92%) delete mode 100644meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patchrename meta/recipes-support/gnutls/{gnutls-2.10.4 =>gnutls-2.12.3}/configure-fix.patch(76%) rename meta/recipes-support/gnutls/{gnutls-2.10.4 =>gnutls-2.12.3}/gnutls-openssl.patch(98%) delete mode 100644 meta/recipes-support/gnutls/gnutls_2.10.4.bb
create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.3.bb
delete mode 100644 meta/recipes-support/libcap/libcap_2.19.bb
create mode 100644 meta/recipes-support/libcap/libcap_2.20.bb
rename meta/recipes-support/lzo/{lzo-2.04 => lzo-2.05}/acinclude.m4 (100%) rename meta/recipes-support/lzo/{lzo-2.04 =>lzo-2.05}/autoconf.patch(84%) rename meta/recipes-support/lzo/{lzo_2.04.bb => lzo_2.05.bb} (59%)
create mode 100644 meta/recipes-support/nettle/files/acinclude.m4
create mode 100644 meta/recipes-support/nettle/nettle_2.1.bb
create mode 100644meta/recipes-support/shared-mime-info/files/fix-parallel-build.patchdelete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_0.80.bb create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky