|
 |
9c33f48 |
diff -up rpm-4.4.2.2/build/rpmfc.c.develdeps rpm-4.4.2.2/build/rpmfc.c
|
|
|
9c33f48 |
--- rpm-4.4.2.2/build/rpmfc.c.develdeps 2007-09-11 09:28:12.000000000 +0300
|
|
|
9c33f48 |
+++ rpm-4.4.2.2/build/rpmfc.c 2007-12-21 14:22:55.000000000 +0200
|
|
|
9c33f48 |
@@ -497,7 +497,7 @@ static struct rpmfcTokens_s rpmfcTokens[
|
|
|
9c33f48 |
{ "ASCII text", RPMFC_WHITE|RPMFC_INCLUDE },
|
|
|
9c33f48 |
{ "ISO-8859 text", RPMFC_WHITE|RPMFC_INCLUDE },
|
|
|
9c33f48 |
|
|
|
9c33f48 |
- { "symbolic link to", RPMFC_SYMLINK },
|
|
|
9c33f48 |
+ { "symbolic link to", RPMFC_SYMLINK|RPMFC_INCLUDE },
|
|
|
9c33f48 |
{ "socket", RPMFC_DEVICE },
|
|
|
9c33f48 |
{ "special", RPMFC_DEVICE },
|
|
|
9c33f48 |
|
|
|
9c33f48 |
@@ -647,6 +647,109 @@ rpmfc rpmfcNew(void)
|
|
|
9c33f48 |
}
|
|
|
9c33f48 |
|
|
|
9c33f48 |
/**
|
|
|
9c33f48 |
+ * Ensure that symlinks for shared libs generate a dep on the shared lib
|
|
|
9c33f48 |
+ * @param fc file classifier
|
|
|
9c33f48 |
+ * @return 0 on success
|
|
|
9c33f48 |
+ */
|
|
|
9c33f48 |
+static int rpmfcSYMLINK(rpmfc fc)
|
|
|
9c33f48 |
+{
|
|
|
9c33f48 |
+ const char * fn = fc->fn[fc->ix];
|
|
|
9c33f48 |
+ struct stat sb;
|
|
|
9c33f48 |
+ int fdno;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ if (stat(fn, &sb) < 0)
|
|
|
9c33f48 |
+ return -1;
|
|
|
9c33f48 |
+ if (S_ISLNK(sb.st_mode))
|
|
|
9c33f48 |
+ return -1;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ fdno = open(fn, O_RDONLY);
|
|
|
9c33f48 |
+ if (fdno < 0) {
|
|
|
9c33f48 |
+ return fdno;
|
|
|
9c33f48 |
+ }
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+#if HAVE_GELF_H && HAVE_LIBELF
|
|
|
9c33f48 |
+ Elf * elf = NULL;
|
|
|
9c33f48 |
+ GElf_Ehdr ehdr_mem, * ehdr;
|
|
|
9c33f48 |
+ int isElf64;
|
|
|
9c33f48 |
+ int i, cnt;
|
|
|
9c33f48 |
+ char * soname = NULL;
|
|
|
9c33f48 |
+ char buf[BUFSIZ];
|
|
|
9c33f48 |
+ char * t;
|
|
|
9c33f48 |
+ rpmds ds;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ (void) elf_version(EV_CURRENT);
|
|
|
9c33f48 |
+ elf = NULL;
|
|
|
9c33f48 |
+ if ((elf = elf_begin (fdno, ELF_C_READ_MMAP, NULL)) == NULL
|
|
|
9c33f48 |
+ || elf_kind(elf) != ELF_K_ELF
|
|
|
9c33f48 |
+ || (ehdr = gelf_getehdr(elf, &ehdr_mem)) == NULL
|
|
|
9c33f48 |
+ || ehdr->e_type != ET_DYN)
|
|
|
9c33f48 |
+ goto exit;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ isElf64 = ehdr->e_ident[EI_CLASS] == ELFCLASS64;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ for (i = 0; i < ehdr->e_phnum; ++i) {
|
|
|
9c33f48 |
+ GElf_Phdr phdr_mem;
|
|
|
9c33f48 |
+ GElf_Phdr *phdr = gelf_getphdr (elf, i, &phdr_mem);
|
|
|
9c33f48 |
+ GElf_Shdr shdr_mem;
|
|
|
9c33f48 |
+ Elf_Data * data = NULL;
|
|
|
9c33f48 |
+ Elf_Scn * scn = NULL;
|
|
|
9c33f48 |
+ GElf_Shdr *shdr = NULL;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ if (phdr == NULL || phdr->p_type != PT_DYNAMIC)
|
|
|
9c33f48 |
+ continue;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ while ((scn = elf_nextscn(elf, scn)) != NULL) {
|
|
|
9c33f48 |
+ shdr = gelf_getshdr(scn, &shdr_mem);
|
|
|
9c33f48 |
+ if (shdr->sh_offset == phdr->p_offset)
|
|
|
9c33f48 |
+ break;
|
|
|
9c33f48 |
+ }
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ scn = gelf_offscn(elf, phdr->p_offset);
|
|
|
9c33f48 |
+ shdr = gelf_getshdr(scn, &shdr_mem);
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ if (scn != NULL && shdr != NULL && shdr->sh_type == SHT_DYNAMIC)
|
|
|
9c33f48 |
+ data = elf_getdata (scn, NULL);
|
|
|
9c33f48 |
+ if (data == NULL)
|
|
|
9c33f48 |
+ continue;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) {
|
|
|
9c33f48 |
+ GElf_Dyn dynmem;
|
|
|
9c33f48 |
+ GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem);
|
|
|
9c33f48 |
+ if (dyn == NULL)
|
|
|
9c33f48 |
+ break;
|
|
|
9c33f48 |
+ if (dyn->d_tag != DT_SONAME)
|
|
|
9c33f48 |
+ continue;
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+ /* add the soname to package deps */
|
|
|
9c33f48 |
+ soname = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val);
|
|
|
9c33f48 |
+ if (soname == NULL)
|
|
|
9c33f48 |
+ break;
|
|
|
9c33f48 |
+ buf[0] = '\0';
|
|
|
9c33f48 |
+ t = buf;
|
|
|
9c33f48 |
+ t = stpcpy(t, soname);
|
|
|
9c33f48 |
+#if !defined(__alpha__)
|
|
|
9c33f48 |
+ if (isElf64)
|
|
|
9c33f48 |
+ t = stpcpy(t, "()(64bit)");
|
|
|
9c33f48 |
+#endif
|
|
|
9c33f48 |
+ t++;
|
|
|
9c33f48 |
+ /* Add to package dependencies. */
|
|
|
9c33f48 |
+ ds = rpmdsSingle(RPMTAG_REQUIRENAME,
|
|
|
9c33f48 |
+ buf, "", RPMSENSE_FIND_REQUIRES);
|
|
|
9c33f48 |
+ rpmdsMerge(&fc->requires, ds);
|
|
|
9c33f48 |
+ rpmfcSaveArg(&fc->ddict, rpmfcFileDep(t, fc->ix, ds));
|
|
|
9c33f48 |
+ ds = rpmdsFree(ds);
|
|
|
9c33f48 |
+ break;
|
|
|
9c33f48 |
+ }
|
|
|
9c33f48 |
+ }
|
|
|
9c33f48 |
+exit:
|
|
|
9c33f48 |
+ if (elf) (void) elf_end(elf);
|
|
|
9c33f48 |
+ close(fdno);
|
|
|
9c33f48 |
+ return 0;
|
|
|
9c33f48 |
+#endif
|
|
|
9c33f48 |
+ return -1;
|
|
|
9c33f48 |
+}
|
|
|
9c33f48 |
+
|
|
|
9c33f48 |
+/**
|
|
|
9c33f48 |
* Extract script dependencies.
|
|
|
9c33f48 |
* @param fc file classifier
|
|
|
9c33f48 |
* @return 0 on success
|
|
|
9c33f48 |
@@ -1094,6 +1197,7 @@ static struct rpmfcApplyTbl_s rpmfcApply
|
|
|
9c33f48 |
{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL) },
|
|
|
9c33f48 |
{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PYTHON) },
|
|
|
9c33f48 |
{ rpmfcSCRIPT, RPMFC_MONO },
|
|
|
9c33f48 |
+ { rpmfcSYMLINK, RPMFC_SYMLINK },
|
|
|
9c33f48 |
{ NULL, 0 }
|
|
|
9c33f48 |
};
|
|
|
9c33f48 |
|