Re: [PATCH 4/8] logrotate: replace fedorahosted.org SRC_URI with yoctoproject.org source

["Choong, Yin Thong" <yin.thong.choong@intel.com>]

[-- Attachment #1.1: Type: text/plain, Size: 3695 bytes --]

Hi,
Once I change to github.com below error pop out. Seem like it miss align with the patch compare with github.com logrotate source. Both package seem got miss align on the version. When I compare yoctoproject logrotate.c and github logrotate.c it has big different (as attached), there even got different parameter count on some API function. Let’s stick with yoctoproject.org/mirror 1st ? Or I check back the github to get for suitable version? Then I may need to rename bbrecipe filename base on the github version? Suggestion?

https://downloads.yoctoproject.org/mirror/sources/logrotate-3.9.1.tar.gz
https://github.com/logrotate/logrotate/archive/r3-9-1.tar.gz

ERROR: logrotate-3.9.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/yinthong/rebeccapoky/build/tmp/work/i586-poky-linux/logrotate/3.9.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
Applying patch act-as-mv-when-rotate.patch
can't find file to patch at input line 20
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001
|From: Robert Yang <liezhi.yang@windriver.com>
|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: Pending
|
|Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|---
| logrotate.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++++----------
| 1 file changed, 59 insertions(+), 12 deletions(-)
|
|diff --git a/logrotate.c b/logrotate.c
|index d3deb6a..cf8bf2c 100644
|--- a/logrotate.c
|+++ b/logrotate.c
--------------------------
No file to patch.  Skipping patch.
6 out of 6 hunks ignored
Patch act-as-mv-when-rotate.patch does not apply (enforce with -f)
ERROR: logrotate-3.9.1-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/yinthong/rebeccapoky/build/tmp/work/i586-poky-linux/logrotate/3.9.1-r0/temp/log.do_patch.130676
ERROR: Task (/home/yinthong/rebeccapoky/meta/recipes-extended/logrotate/logrotate_3.9.1.bb:do_patch) failed with exit code '1'

Thanks and Regards
Choong YinThong

From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: Monday, April 3, 2017 5:17 PM
To: Kukkonen, Jussi <jussi.kukkonen@intel.com>
Cc: Choong, Yin Thong <yin.thong.choong@intel.com>; Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH 4/8] logrotate: replace fedorahosted.org SRC_URI with yoctoproject.org source


On 3 April 2017 at 09:30, Jussi Kukkonen <jussi.kukkonen@intel.com<mailto:jussi.kukkonen@intel.com>> wrote:
This is true, there's not that much in the repo itself to create trust. The major show of trust is here though: http://pkgs.fedoraproject.org/cgit/rpms/logrotate.git/commit/?id=9cb55142e51b82085d6c3136448c1f441454e351
Fedora/Red Hat themselves changed to use this repo when the fedorahosted repos were EOL'd (see also Red Hat folks working on the github issues in January).

So logrotate was originally hosted on Fedora infrastructure that is then shut down, a github repository appears and Fedora fetch from that github repository.  Also the commit in the github repository to change the README from fedorahosted to github (https://github.com/logrotate/logrotate/commit/09c4fa8bc6cf2c01bad24d33c3ea69371030c014) was committed by a Red Hat employee (https://github.com/kdudka).

Whilst there are many official-looking forks on github that are just Some Guy, this is clearly the new canonical home.

Ross

[-- Attachment #1.2: Type: text/html, Size: 14167 bytes --]

[-- Attachment #2: 1styocto_2ndgithub_logrotate.diff --]
[-- Type: application/octet-stream, Size: 3102 bytes --]

1159a1160,1206
> /* Act as the "mv" command, if rename failed, then read the old file and
>  * write to new file. The function which invokes the mvFile will use
>  * the strerror(errorno) to handle the error message, so we don't have
>  * to print the error message here */
> 
> int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl)
> {
>     struct stat sbprev;
>     int fd_old, fd_new, n;
>     char buf[BUFSIZ];
> 
>     /* Do the rename first */
>     if (!rename(oldName, newName))
>         return 0;
> 
>     /* If the errno is EXDEV, then read old file, write newfile and
>      * remove the oldfile */
>     if (errno == EXDEV) {
>         /* Open the old file to read */
>         if ((fd_old = open(oldName, O_RDONLY)) < 0)
>             return 1;
> 
>         /* Create the file to write, keep the same attribute as the old file */
>         if (stat(oldName, &sbprev))
>             return 1;
>         else {
>             if ((fd_new = createOutputFile(newName,
>                 O_WRONLY | O_CREAT | O_TRUNC, &sbprev, acl, 0)) < 0 )
>                 return 1;
>         }
> 
>         /* Read and write */
>         while ((n = read(fd_old, buf, BUFSIZ)) > 0)
>             if (write(fd_new, buf, n) != n)
>                 return 1;
> 
>         if ((close(fd_old) < 0) ||
>             removeLogFile(oldName, log) ||
>             (close(fd_new) < 0))
>             return 1;
> 
>         return 0;
>     }
> 
>     return 1;
> }
> 
1526c1573
< 		    "renaming %s to %s (rotatecount %d, logstart %d, i %d), \n",
---
> 		    "moving %s to %s (rotatecount %d, logstart %d, i %d), \n",
1529c1576
< 	    if (!debug && rename(oldName, newName)) {
---
> 	    if (!debug && mvFile(oldName, newName, log, prev_acl)) {
1534c1581
< 		    message(MESS_ERROR, "error renaming %s to %s: %s\n",
---
> 		    message(MESS_ERROR, "error moving %s to %s: %s\n",
1672c1719
< 			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
---
> 			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
1674,1675c1721,1722
< 			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",
1682c1729
< 			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
---
> 			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
1685,1686c1732,1733
< 			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",
2066c2113
< static int writeState(char *stateFilename)
---
> static int writeState(struct logInfo *log, char *stateFilename)
2230c2277
< 		if (rename(tmpFilename, stateFilename)) {
---
> 		if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
2528c2575
< 		rc |= writeState(stateFile);
---
> 		rc |= writeState(log, stateFile);