Handle config.guess and config.sub with DOS EOLs

[platform/upstream/rpm.git] / build / parseBuildInstallClean.c

diff --git a/build/parseBuildInstallClean.c b/build/parseBuildInstallClean.c
index f16127b..5ecf77c 100644 (file)
--- a/build/parseBuildInstallClean.c
+++ b/build/parseBuildInstallClean.c
@@ -4,14 +4,14 @@
  */
 #include "system.h"
 
-#include <rpmbuild.h>
-#include <rpmlog.h>
+#include <rpm/rpmlog.h>
+#include "build/rpmbuild_internal.h"
 #include "debug.h"
 
 
-int parseBuildInstallClean(rpmSpec spec, rpmParseState parsePart)
+int parseBuildInstallClean(rpmSpec spec, int parsePart)
 {
-    int nextPart, rc;
+    int nextPart, rc, res = PART_ERROR;
     StringBuf *sbp = NULL;
     const char *name = NULL;
 
@@ -27,29 +27,60 @@ int parseBuildInstallClean(rpmSpec spec, rpmParseState parsePart)
     } else if (parsePart == PART_CLEAN) {
        sbp = &(spec->clean);
        name = "%clean";
+    } else {
+       goto exit; /* programmer error */
     }
     
     if (*sbp != NULL) {
        rpmlog(RPMLOG_ERR, _("line %d: second %s\n"),
                spec->lineNum, name);
-       return RPMRC_FAIL;
+       goto exit;
     }
     
     *sbp = newStringBuf();
 
     /* There are no options to %build, %install, %check, or %clean */
-    if ((rc = readLine(spec, STRIP_NOTHING)) > 0)
-       return PART_NONE;
-    if (rc != RPMRC_OK)
-       return rc;
-    
+    if ((rc = readLine(spec, STRIP_NOTHING)) > 0) {
+       res = PART_NONE;
+       goto exit;
+    } else if (rc < 0) {
+       goto exit;
+    }
+
+    if (parsePart == PART_BUILD) {
+       char* buf = strdup(
+                          "ref=/usr/lib/rpm\n"
+                          "mints=0\n"
+                          "case $(uname -m) in\n"
+                          "    aarch64) mints=20120610;;\n"
+                          "    ppc64le) mints=20130610;;\n"
+                          "    riscv64) mints=20160911;;\n"
+                          "esac\n"
+                          "for s in guess sub; do\n"
+                          "    for c in $(find -maxdepth 8 -name \"config.$s\"); do\n"
+                          "         grep -q config-patches@ $c || continue\n"
+                          "         timestamp=$(sed -n \"/^timestamp=/{s///;s/[-'\\\"]//g;p;q;}\" $c | tr -d '\r')\n"
+                          "         test -n \"$timestamp\" || timestamp=0\n"
+                          "         test $timestamp -ge $mints || install -m 755 $ref/config.$s $c\n"
+                          "     done\n"
+                          "done\n"
+                          );
+        appendLineStringBuf(*sbp, buf);
+        free(buf);
+    }
+
     while (! (nextPart = isPart(spec->line))) {
        appendStringBuf(*sbp, spec->line);
-       if ((rc = readLine(spec, STRIP_NOTHING)) > 0)
-           return PART_NONE;
-       if (rc)
-           return rc;
+       if ((rc = readLine(spec, STRIP_NOTHING)) > 0) {
+           nextPart = PART_NONE;
+           break;
+       } else if (rc < 0) {
+           goto exit;
+       }
     }
+    res = nextPart;
+    
+exit:
 
-    return nextPart;
+    return res;
 }