Update to 4.11.0.1

[platform/upstream/rpm.git] / lib / rpmds.h

diff --git a/lib/rpmds.h b/lib/rpmds.h
index b093224..bceed00 100644 (file)
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -22,12 +22,13 @@ extern int _rpmds_nopromote;
 /** \ingroup rpmds
  * Dependency Attributes.
  */
-typedef        enum rpmsenseFlags_e {
+enum rpmsenseFlags_e {
     RPMSENSE_ANY       = 0,
     RPMSENSE_LESS      = (1 << 1),
     RPMSENSE_GREATER   = (1 << 2),
     RPMSENSE_EQUAL     = (1 << 3),
-    /* bits 4-5 unused */
+    /* bit 4 unused */
+    RPMSENSE_POSTTRANS = (1 << 5),     /*!< %posttrans dependency */
     RPMSENSE_PREREQ    = (1 << 6),     /* legacy prereq dependency */
     RPMSENSE_PRETRANS  = (1 << 7),     /*!< Pre-transaction dependency. */
     RPMSENSE_INTERP    = (1 << 8),     /*!< Interpreter used by scriptlet. */
@@ -47,9 +48,11 @@ typedef      enum rpmsenseFlags_e {
     RPMSENSE_RPMLIB = (1 << 24),       /*!< rpmlib(feature) dependency. */
     RPMSENSE_TRIGGERPREIN = (1 << 25), /*!< %triggerprein dependency. */
     RPMSENSE_KEYRING   = (1 << 26),
-    /* bit 27 unused */
+    RPMSENSE_STRONG     = (1 << 27),
     RPMSENSE_CONFIG    = (1 << 28)
-} rpmsenseFlags;
+};
+
+typedef rpmFlags rpmsenseFlags;
 
 #define        RPMSENSE_SENSEMASK      15       /* Mask to get senses, ie serial, */
                                          /* less, greater, equal.          */
@@ -68,11 +71,14 @@ typedef     enum rpmsenseFlags_e {
     RPMSENSE_RPMLIB | \
     RPMSENSE_KEYRING | \
     RPMSENSE_PRETRANS | \
-    RPMSENSE_PREREQ)
+    RPMSENSE_POSTTRANS | \
+    RPMSENSE_PREREQ | \
+    RPMSENSE_MISSINGOK | \
+    RPMSENSE_STRONG)
 
 #define        _notpre(_x)             ((_x) & ~RPMSENSE_PREREQ)
 #define        _INSTALL_ONLY_MASK \
-    _notpre(RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POST|RPMSENSE_RPMLIB|RPMSENSE_KEYRING|RPMSENSE_PRETRANS)
+    _notpre(RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POST|RPMSENSE_RPMLIB|RPMSENSE_KEYRING|RPMSENSE_PRETRANS|RPMSENSE_POSTTRANS)
 #define        _ERASE_ONLY_MASK  \
     _notpre(RPMSENSE_SCRIPT_PREUN|RPMSENSE_SCRIPT_POSTUN)
 
@@ -93,6 +99,7 @@ rpmds rpmdsLink(rpmds ds);
  * @return             NULL always
  */
 rpmds rpmdsFree(rpmds ds);
+
 /** \ingroup rpmds
  * Create and load a dependency set.
  * @param h            header
@@ -100,7 +107,7 @@ rpmds rpmdsFree(rpmds ds);
  * @param flags                unused
  * @return             new dependency set
  */
-rpmds rpmdsNew(Header h, rpmTag tagN, int flags);
+rpmds rpmdsNew(Header h, rpmTagVal tagN, int flags);
 
 /** \ingroup rpmds
  * Return new formatted dependency string.
@@ -117,7 +124,7 @@ char * rpmdsNewDNEVR(const char * dspfx, const rpmds ds);
  * @param Flags                comparison flags
  * @return             new dependency set
  */
-rpmds rpmdsThis(Header h, rpmTag tagN, rpmsenseFlags Flags);
+rpmds rpmdsThis(Header h, rpmTagVal tagN, rpmsenseFlags Flags);
 
 /** \ingroup rpmds
  * Create, load and initialize a dependency set of size 1.
@@ -127,7 +134,7 @@ rpmds rpmdsThis(Header h, rpmTag tagN, rpmsenseFlags Flags);
  * @param Flags                comparison flags
  * @return             new dependency set
  */
-rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, rpmsenseFlags Flags);
+rpmds rpmdsSingle(rpmTagVal tagN, const char * N, const char * EVR, rpmsenseFlags Flags);
 
 /** \ingroup rpmds
  * Return a new dependency set of size 1 from the current iteration index
@@ -191,7 +198,7 @@ rpmsenseFlags rpmdsFlags(const rpmds ds);
  * @param ds           dependency set
  * @return             current dependency type, 0 on invalid
  */
-rpmTag rpmdsTagN(const rpmds ds);
+rpmTagVal rpmdsTagN(const rpmds ds);
 
 /** \ingroup rpmds
  * Return dependency header instance, ie whether the dependency comes from 
@@ -306,6 +313,16 @@ int rpmdsCompare(const rpmds A, const rpmds B);
 int rpmdsAnyMatchesDep (const Header h, const rpmds req, int nopromote);
 
 /** \ingroup rpmds
+ * Compare package provides dependencies from header with a single dependency.
+ * @param h            header
+ * @param ix            index in header provides
+ * @param req          dependency set
+ * @param nopromote    Don't promote Epoch: in comparison?
+ * @return             1 if any dependency overlaps, 0 otherwise
+ */
+int rpmdsMatchesDep (const Header h, int ix, const rpmds req, int nopromote);
+
+/** \ingroup rpmds
  * Compare package name-version-release from header with a single dependency.
  * @param h            header
  * @param req          dependency set
@@ -320,7 +337,7 @@ int rpmdsNVRMatchesDep(const Header h, const rpmds req, int nopromote);
  * @param tblp         rpmlib provides table (NULL uses internal table)
  * @return             0 on success
  */
-int rpmdsRpmlib(rpmds * dsp, void * tblp);
+int rpmdsRpmlib(rpmds * dsp, const void * tblp);
 
 #ifdef __cplusplus
 }