rpki-client / rpki-client-portable

Portability shim for OpenBSD's rpki-client

Home Page:https://rpki-client.org

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

"1 out of 5 hunks FAILED" while trying to install

dorpauli opened this issue · comments

Hello,

Yesterday and this morning, i tried to reinstall rpki-client-portable. While executing the autogen.sh script, a failure occured.

This is the Output of the execution:

Bereits auf 'master'
Ihr Branch ist auf demselben Stand wie 'origin/master'.
Bereits aktuell.
Aktueller Branch master ist auf dem neuesten Stand.
copying tal
copying includes
Copying as.c
Copying cert.c
Copying cms.c
Copying crl.c
Copying extern.h
Copying gbr.c
Copying http.c
Copying io.c
Copying ip.c
Copying log.c
Copying main.c
Copying mft.c
Copying mkdir.c
Copying output-bgpd.c
Copying output-bird.c
Copying output-csv.c
Copying output-json.c
Copying output.c
Copying parser.c
Copying roa.c
Copying rpki-client.8
Copying rsync.c
Copying tal.c
Copying validate.c
Copying x509.c
Applying patch patches/0001-Allow-overriding-default-user-and-file-locations.patch
1 out of 5 hunks FAILED -- saving rejects to file main.c.rej

And the content of main.c.rej is:

--- main.c
+++ main.c
@@ -761,7 +761,7 @@ main(int argc, char *argv[])
        struct msgbuf    procq, rsyncq;
        struct pollfd    pfd[2];
        struct roa      **out = NULL;
-       char            *rsync_prog = "openrsync";
+       char            *rsync_prog = RPKI_RSYNC_CMD;
        char            *bind_addr = NULL;
        const char      *cachedir = NULL, *errs;
        const char      *tals[TALSZ_MAX];

I tried to change it manually, but by executing the script, it is changed back.

Fixed with e45b854