1 diff --git a/lib/depends.c b/lib/depends.c
2 index 28a4a784d..1d8ce1f8a 100644
5 @@ -690,6 +690,17 @@ retry:
9 + char * N = rpmdsN(dep);
10 + if (strstr(N, "uname") == N) {
11 + if (tsmem->uname == NULL)
12 + rpmdsUnamePool(rpmtsPool(ts), &(tsmem->uname));
14 + if (tsmem->uname != NULL && rpmdsSearch(tsmem->uname, dep) >= 0) {
15 + rpmdsNotify(dep, "(uname provides)", rc);
20 /* Dont look at pre-requisites of already installed packages */
21 if (!adding && isTransientReq(dsflags))
23 diff --git a/lib/rpmds.c b/lib/rpmds.c
24 index f7ee76392..754969e39 100644
31 +#include <sys/utsname.h>
33 #include <rpm/rpmtypes.h>
34 #include <rpm/rpmlib.h> /* rpmvercmp */
35 @@ -1596,3 +1597,51 @@ rpmRC rpmdsParseRichDep(rpmds dep, rpmds *leftds, rpmds *rightds, rpmrichOp *op,
39 +int rpmdsUnamePool(rpmstrPool pool, rpmds * dsp)
42 + static const char * NS = "uname";
49 + ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, "uname(sysname)", un.sysname, RPMSENSE_EQUAL);
50 + rc = rpmdsMerge(dsp, ds);
54 + ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, "uname(nodename)", un.nodename, RPMSENSE_EQUAL);
55 + rc = rpmdsMerge(dsp, ds);
59 + ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, "uname(release)", un.release, RPMSENSE_EQUAL);
60 + rc = rpmdsMerge(dsp, ds);
64 + ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, "uname(machine)", un.machine, RPMSENSE_EQUAL);
65 + rc = rpmdsMerge(dsp, ds);
69 +#if defined(__linux__)
70 + ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, "uname(domainname)", un.domainname, RPMSENSE_EQUAL);
71 + rc = rpmdsMerge(dsp, ds);
77 + /* freeze the pool to save memory, but only if private pool */
78 + if (*dsp && (*dsp)->pool != pool)
79 + rpmstrPoolFreeze((*dsp)->pool, 0);
80 + return (rc < 0) ? -1 : 0;
83 +int rpmdsUname(rpmds * dsp)
85 + return rpmdsUnamePool(NULL, dsp);
87 diff --git a/lib/rpmds.h b/lib/rpmds.h
88 index 90d54aa27..558252c04 100644
91 @@ -412,6 +412,13 @@ int rpmdsNVRMatchesDep(const Header h, const rpmds req, int nopromote);
93 int rpmdsRpmlib(rpmds * dsp, const void * tblp);
96 + * Load uname provides into a dependency set.
97 + * @retval *dsp (loaded) dependency set
98 + * @return 0 on success
100 +int rpmdsUname(rpmds * dsp);
103 * Create and load a dependency set.
104 * @param pool shared string pool (or NULL for private pool)
105 @@ -468,6 +475,14 @@ rpmds rpmdsSinglePoolTix(rpmstrPool pool, rpmTagVal tagN,
107 int rpmdsRpmlibPool(rpmstrPool pool, rpmds * dsp, const void * tblp);
110 + * Load uname provides into a dependency set.
111 + * @param pool shared string pool (or NULL for private pool)
112 + * @retval *dsp (loaded) dependency set
113 + * @return 0 on success
115 +int rpmdsUnamePool(rpmstrPool pool, rpmds * dsp);
118 typedef enum rpmrichOp_e {
119 RPMRICHOP_SINGLE = 1,
120 diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
121 index e69ef2584..ecdb12f0c 100644
122 --- a/lib/rpmts_internal.h
123 +++ b/lib/rpmts_internal.h
124 @@ -21,6 +21,7 @@ typedef struct tsMembers_s {
125 rpmal addedPackages; /*!< Set of packages being installed. */
127 rpmds rpmlib; /*!< rpmlib() dependency set. */
128 + rpmds uname; /*!< uname() dependency set. */
129 rpmte * order; /*!< Packages sorted by dependencies. */
130 int orderCount; /*!< No. of transaction elements. */
131 int orderAlloced; /*!< No. of allocated transaction elements. */