Packages upgrade
cover Packages upgrade
The following changes since commit 530565c6cb77319f4cc49edeea6fec6be997415d:
glibc: Update to glibc 2.21 release tag (2015-02-19 17:04:19 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/pu
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pu
Robert Yang (6):
quilt: 0.63 -> 0.64
cups: 2.0.1 -> 2.0.2
git: 2.2.1 -> 2.3.0
python-git: 0.3.3 -> 0.3.6
python-gitdb: 0.6.1 -> 0.6.4
logrotate: 3.8.8 -> 3.8.9
meta/recipes-devtools/git/git.inc | 1 +
.../git/{git_2.2.1.bb => git_2.3.0.bb} | 8 ++--
.../{python-git_0.3.3.bb => python-git_0.3.6.bb} | 4 +-
...python-gitdb_0.6.1.bb => python-gitdb_0.6.4.bb} | 4 +-
.../{quilt-native_0.63.bb => quilt-native_0.64.bb} | 2 +-
.../quilt/{quilt-0.63.inc => quilt.inc} | 4 +-
.../quilt/{quilt_0.63.bb => quilt_0.64.bb} | 2 +-
meta/recipes-extended/cups/cups.inc | 1 -
...1-test-ippserver.c-check-avahi-before-use.patch | 34 --------------
.../cups/{cups_2.0.1.bb => cups_2.0.2.bb} | 4 +-
.../logrotate/act-as-mv-when-rotate.patch | 48 ++++++++++----------
.../disable-check-different-filesystems.patch | 30 ++++++------
.../logrotate/logrotate/update-the-manual.patch | 26 +++++++----
.../{logrotate_3.8.8.bb => logrotate_3.8.9.bb} | 4 +-
14 files changed, 75 insertions(+), 97 deletions(-)
rename meta/recipes-devtools/git/{git_2.2.1.bb => git_2.3.0.bb} (41%)
rename meta/recipes-devtools/python/{python-git_0.3.3.bb => python-git_0.3.6.bb} (85%)
rename meta/recipes-devtools/python/{python-gitdb_0.6.1.bb => python-gitdb_0.6.4.bb} (78%)
rename meta/recipes-devtools/quilt/{quilt-native_0.63.bb => quilt-native_0.64.bb} (51%)
rename meta/recipes-devtools/quilt/{quilt-0.63.inc => quilt.inc} (92%)
rename meta/recipes-devtools/quilt/{quilt_0.63.bb => quilt_0.64.bb} (95%)
delete mode 100644 meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch
rename meta/recipes-extended/cups/{cups_2.0.1.bb => cups_2.0.2.bb} (40%)
rename meta/recipes-extended/logrotate/{logrotate_3.8.8.bb => logrotate_3.8.9.bb} (93%)Signature · 1 line
1.7.9.5
PATCH 2/6 cups: 2.0.1 -> 2.0.2
Removed the patch since upstream has fixed it:
0001-test-ippserver.c-check-avahi-before-use.patch
---
meta/recipes-extended/cups/cups.inc | 1 -
...1-test-ippserver.c-check-avahi-before-use.patch | 34 --------------------
.../cups/{cups_2.0.1.bb => cups_2.0.2.bb} | 4 +--
3 files changed, 2 insertions(+), 37 deletions(-)
delete mode 100644 meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch
rename meta/recipes-extended/cups/{cups_2.0.1.bb => cups_2.0.2.bb} (40%)meta/recipes-extended/cups/cups.inc +0 -1
@@ -10,7 +10,6 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ file://cups.socket \ file://cups.path \ file://cups.service \ - file://0001-test-ippserver.c-check-avahi-before-use.patch \ " LEAD_SONAME = "libcupsdriver.so"
meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From fba92768324e76fa60d9c5f709e045bd4f7aee89 Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Sat, 3 Jan 2015 05:56:24 +0000 -Subject: [PATCH] test/ippserver.c: check avahi before use it - -Fixed the error when --disable-avahi: -ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll' - -The avahi is optional, we need check whether it is enabled before use as -other code does. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <[email protected]> ---- - test/ippserver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/ippserver.c b/test/ippserver.c -index c785e5f..26c8a66 100644 ---- a/test/ippserver.c -+++ b/test/ippserver.c -@@ -421,7 +421,7 @@ static int valid_job_attributes(_ipp_client_t *client); - - # ifdef HAVE_DNSSD - static DNSServiceRef DNSSDMaster = NULL; --# else /* HAVE_AVAHI */ -+# elif defined(HAVE_AVAHI) /* HAVE_AVAHI */ - static AvahiThreadedPoll *DNSSDMaster = NULL; - static AvahiClient *DNSSDClient = NULL; - # endif /* HAVE_DNSSD */ --- -2.0.1 -
meta/recipes-extended/cups/cups_2.0.2.bb renamed from meta/recipes-extended/cups/cups_2.0.1.bb +2 -2
@@ -2,5 +2,5 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0" -SRC_URI[md5sum] = "7f7c33071035fb20d0879929a42da711" -SRC_URI[sha256sum] = "60f7f2cca69f3b761a029fb314ee4299e3ea0fc02350f06d192cf31d58215525" +SRC_URI[md5sum] = "6e0ea72dbafcf5baaa1cf4178e71096d" +SRC_URI[sha256sum] = "858720f76b66fd0441ae2a16f7cabd9554c8c64607e28ffacf16c36c53a3b18b"
Signature · 1 line
1.7.9.5
PATCH 1/6 quilt: 0.63 -> 0.64
In reply to Robert Yangquilt-0.63.inc -> quilt.inc: we don't have multiple quilt-xxx.inc, so use quilt.inc rather than quilt-0.63.inc.
---
.../{quilt-native_0.63.bb => quilt-native_0.64.bb} | 2 +-
.../quilt/{quilt-0.63.inc => quilt.inc} | 4 ++--
.../quilt/{quilt_0.63.bb => quilt_0.64.bb} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/quilt/{quilt-native_0.63.bb => quilt-native_0.64.bb} (51%)
rename meta/recipes-devtools/quilt/{quilt-0.63.inc => quilt.inc} (92%)
rename meta/recipes-devtools/quilt/{quilt_0.63.bb => quilt_0.64.bb} (95%)meta/recipes-devtools/quilt/quilt-native_0.64.bb renamed from meta/recipes-devtools/quilt/quilt-native_0.63.bb +1 -1
@@ -1,2 +1,2 @@ -require quilt-${PV}.inc +require quilt.inc require quilt-native.inc
meta/recipes-devtools/quilt/quilt.inc renamed from meta/recipes-devtools/quilt/quilt-0.63.inc +2 -2
@@ -10,8 +10,8 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://Makefile \ " -SRC_URI[md5sum] = "c0ef4beb58a6fa72563b955e70624b6e" -SRC_URI[sha256sum] = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52" +SRC_URI[md5sum] = "fc0310db5868a0873d602d4332a76d43" +SRC_URI[sha256sum] = "c4bfd3282214a288e8d3e921ae4d52e73e24c4fead72b5446752adee99a7affd" inherit autotools-brokensep ptest
meta/recipes-devtools/quilt/quilt_0.64.bb renamed from meta/recipes-devtools/quilt/quilt_0.63.bb +1 -1
@@ -1,4 +1,4 @@ -require quilt-${PV}.inc +require quilt.inc inherit gettext RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" SRC_URI += "file://aclocal.patch \
Signature · 1 line
1.7.9.5
PATCH 3/6 git: 2.2.1 -> 2.3.0
In reply to Robert Yang---
meta/recipes-devtools/git/git.inc | 1 +
.../git/{git_2.2.1.bb => git_2.3.0.bb} | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/git/{git_2.2.1.bb => git_2.3.0.bb} (41%)meta/recipes-devtools/git/git.inc +1 -0
@@ -1,4 +1,5 @@ SUMMARY = "Distributed version control system" +HOMEPAGE = "http://git-scm.com" SECTION = "console/utils" LICENSE = "GPLv2" DEPENDS = "openssl curl zlib expat"
meta/recipes-devtools/git/git_2.3.0.bb renamed from meta/recipes-devtools/git/git_2.2.1.bb +4 -4
@@ -1,9 +1,9 @@ require git.inc -SRC_URI[tarball.md5sum] = "ff41fdb094eed1ec430aed8ee9b9849c" -SRC_URI[tarball.sha256sum] = "367a77d0b10a5070b02a0fb0e942f26f25af61793128e0ddfd5c5c474de93589" -SRC_URI[manpages.md5sum] = "b5ddd262b608804ba4403f0f82d881d7" -SRC_URI[manpages.sha256sum] = "69dcb3decdb33dd35491935e80f71c40c576b536df4223eb98d5f7ccd9643293" +SRC_URI[tarball.md5sum] = "edf994cf34cd3354dadcdfa6b4292335" +SRC_URI[tarball.sha256sum] = "ba2fe814e709a5d0f034ebe82083fce7feed0899b3a8c8b3adf1c5a85d1ce9ac" +SRC_URI[manpages.md5sum] = "620797eb73b281d0706979ae8038bbd7" +SRC_URI[manpages.sha256sum] = "8aa4d1e5d7bbf5641a9de92279369d9b20cc266ba7b2888104efa40e80b53559" EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
Signature · 1 line
1.7.9.5
PATCH 4/6 python-git: 0.3.3 -> 0.3.6
In reply to Robert Yang---
.../{python-git_0.3.3.bb => python-git_0.3.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-git_0.3.3.bb => python-git_0.3.6.bb} (85%)meta/recipes-devtools/python/python-git_0.3.6.bb renamed from meta/recipes-devtools/python/python-git_0.3.3.bb +2 -2
@@ -11,8 +11,8 @@ DEPENDS = "python-gitdb" SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz" -SRC_URI[md5sum] = "c9fdde02c476c11168fd620659496aba" -SRC_URI[sha256sum] = "08193acf4e22b57a471cde3748ebce7c17e0f15f1e5042db74ca2c5e9e3e4db5" +SRC_URI[md5sum] = "87404ab9e0fcee81e660e932b3d9f2c6" +SRC_URI[sha256sum] = "f3f42ca085eedbd3a9956b5e639de58bbe77a119f6b3d5c3af27669a2322c4a9" S = "${WORKDIR}/GitPython-${PV}"
Signature · 1 line
1.7.9.5
PATCH 5/6 python-gitdb: 0.6.1 -> 0.6.4
In reply to Robert Yang---
...python-gitdb_0.6.1.bb => python-gitdb_0.6.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-gitdb_0.6.1.bb => python-gitdb_0.6.4.bb} (78%)meta/recipes-devtools/python/python-gitdb_0.6.4.bb renamed from meta/recipes-devtools/python/python-gitdb_0.6.1.bb +2 -2
@@ -7,8 +7,8 @@ DEPENDS = "python-async python-smmap" SRC_URI = "https://pypi.python.org/packages/source/g/gitdb/gitdb-${PV}.tar.gz" -SRC_URI[md5sum] = "daeb85a5e97d2d100fd37cf522fd65d5" -SRC_URI[sha256sum] = "0d784ec4a75e93c8f65d4aca219c17e388a052d461714ed0edfda657e542b716" +SRC_URI[md5sum] = "44e4366b8bdfd306b075c3a52c96ae1a" +SRC_URI[sha256sum] = "a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658" S = "${WORKDIR}/gitdb-${PV}"
Signature · 1 line
1.7.9.5
PATCH 6/6 logrotate: 3.8.8 -> 3.8.9
In reply to Robert Yang---
.../logrotate/act-as-mv-when-rotate.patch | 48 ++++++++++----------
.../disable-check-different-filesystems.patch | 30 ++++++------
.../logrotate/logrotate/update-the-manual.patch | 26 +++++++----
.../{logrotate_3.8.8.bb => logrotate_3.8.9.bb} | 4 +-
4 files changed, 60 insertions(+), 48 deletions(-)
rename meta/recipes-extended/logrotate/{logrotate_3.8.8.bb => logrotate_3.8.9.bb} (93%)meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch +25 -23
@@ -1,9 +1,12 @@ -Act as the "mv" command when rotate log +From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Tue, 17 Feb 2015 21:08:07 -0800 +Subject: [PATCH] Act as the "mv" command when rotate log Act as the "mv" command when rotate log, first rename, if failed, then read and write. -Upstream-Status: Submitted +Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> ---
@@ -11,10 +14,10 @@ Signed-off-by: Robert Yang <[email protected]> 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/logrotate.c b/logrotate.c -index 174a26b..b18b629 100644 +index 05e74c9..616418f 100644 --- a/logrotate.c +++ b/logrotate.c -@@ -906,6 +906,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force) +@@ -1000,6 +1000,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force) return 0; }
@@ -68,7 +71,7 @@ index 174a26b..b18b629 100644 int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, struct logNames *rotNames) { -@@ -1268,15 +1315,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, +@@ -1364,15 +1411,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, } message(MESS_DEBUG,
@@ -87,22 +90,21 @@ index 174a26b..b18b629 100644 oldName, newName, strerror(errno)); hasErrors = 1; } -@@ -1408,11 +1455,11 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state, +@@ -1511,10 +1558,10 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state, + return 1; } - } - #endif /* WITH_ACL */ -- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], -+ message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum], - rotNames->finalName); - if (!debug && !hasErrors && -- rename(log->files[logNum], rotNames->finalName)) { -- message(MESS_ERROR, "failed to rename %s to %s: %s\n", -+ mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) { -+ message(MESS_ERROR, "failed to move %s to %s: %s\n", - log->files[logNum], rotNames->finalName, - strerror(errno)); - hasErrors = 1; -@@ -1775,7 +1822,7 @@ int rotateLogSet(struct logInfo *log, int force) + +- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], ++ message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum], + tmpFilename); +- if (!debug && !hasErrors && rename(log->files[logNum], tmpFilename)) { +- message(MESS_ERROR, "failed to rename %s to %s: %s\n", ++ if (!debug && !hasErrors && mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) { ++ message(MESS_ERROR, "failed to move %s to %s: %s\n", + log->files[logNum], tmpFilename, + strerror(errno)); + if (errno == ENOENT) { +@@ -1912,7 +1959,7 @@ int rotateLogSet(struct logInfo *log, int force) return hasErrors; }
@@ -111,7 +113,7 @@ index 174a26b..b18b629 100644 { struct logState *p; FILE *f; -@@ -1939,7 +1986,7 @@ static int writeState(char *stateFilename) +@@ -2076,7 +2123,7 @@ static int writeState(char *stateFilename) fclose(f); if (error == 0) {
@@ -120,7 +122,7 @@ index 174a26b..b18b629 100644 unlink(tmpFilename); error = 1; message(MESS_ERROR, "error renaming temp state file %s\n", -@@ -2223,7 +2270,7 @@ int main(int argc, const char **argv) +@@ -2362,7 +2409,7 @@ int main(int argc, const char **argv) rc |= rotateLogSet(log, force); if (!debug)
@@ -130,5 +132,5 @@ index 174a26b..b18b629 100644 return (rc != 0); } -- -1.7.10.4 +1.7.9.5
meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +17 -13
@@ -1,9 +1,12 @@ -Disable the check for different filesystems +From 263212af7b7fe1083f777255d91f029401391e4f Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Tue, 17 Feb 2015 21:18:39 -0800 +Subject: [PATCH] Disable the check for different filesystems The logrotate supports rotate log across different filesystems now, so disable the check for different filesystems. -Upstream-Status: Submitted +Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> ---
@@ -11,24 +14,25 @@ Signed-off-by: Robert Yang <[email protected]> 1 file changed, 9 deletions(-) diff --git a/config.c b/config.c -index e0eadb7..c23092f 100644 +index dbbf563..64e66f6 100644 --- a/config.c +++ b/config.c -@@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) - dirName, strerror(errno)); - goto error; +@@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) + goto error; + } } - - if (sb.st_dev != sb2.st_dev -- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { -- message(MESS_ERROR, -- "%s:%d olddir %s and log file %s " -- "are on different devices\n", configFile, -- lineNum, newlog->oldDir, newlog->files[i]); -- goto error; +- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) { +- message(MESS_ERROR, +- "%s:%d olddir %s and log file %s " +- "are on different devices\n", configFile, +- lineNum, newlog->oldDir, newlog->files[i]); +- goto error; - } } - } + } -- 1.7.9.5 +
meta/recipes-extended/logrotate/logrotate/update-the-manual.patch +16 -10
@@ -1,26 +1,32 @@ -Update the manual +From e0b0fe30e9c49234994a20a86aacfaf80e690087 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Tue, 17 Feb 2015 21:14:37 -0800 +Subject: [PATCH] Update the manual Update the manual for rotating on different filesystems. -Upstream-Status: Submitted +Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> --- - logrotate.8 | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) + logrotate.8 | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/logrotate.8 b/logrotate.8 -index 8b34167..5f15432 100644 +index e4e5f48..84407d0 100644 --- a/logrotate.8 +++ b/logrotate.8 -@@ -374,10 +374,9 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option). +@@ -405,12 +405,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option). + .TP \fBolddir \fIdirectory\fR - Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR --must be on the same physical device as the log file being rotated, --and is assumed to be relative to the directory holding the log file +-Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be +-on the same physical device as the log file being rotated, unless \fBcopy\fR, +-\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR +-is assumed to be relative to the directory holding the log file -unless an absolute path name is specified. When this option is used all -old versions of the log end up in \fIdirectory\fR. This option may be ++Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR +is assumed to be relative to the directory holding the log file unless +an absolute path name is specified. When this option is used all old +versions of the log end up in \fIdirectory\fR. This option may be
@@ -28,5 +34,5 @@ index 8b34167..5f15432 100644 .TP -- -1.7.4.1 +1.7.9.5
meta/recipes-extended/logrotate/logrotate_3.8.9.bb renamed from meta/recipes-extended/logrotate/logrotate_3.8.8.bb +2 -2
@@ -16,8 +16,8 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca" -SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f" +SRC_URI[md5sum] = "2660f30742da79870d15d042b07829f6" +SRC_URI[sha256sum] = "700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7" PACKAGECONFIG ?= "\ ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
Signature · 1 line
1.7.9.5