Eliminate vendoring on Rawhide (#730)

It has become possible to eliminate crate vendoring all together for Rawhide. This PR removes vendoring from the top level spec, Containerfile, and CI. This also: - Drops fc37 build - Bumps nom to v7.1 - Switches from lmdb-rkv to lmdb v0.8 - Bumps other deps for Fedora package compat - Uses urls for SourceX rather than relative paths #715 # Conflicts: # .copr/Makefile # .github/workflows/rpm.yml # Cargo.lock # Containerfile # crates/trust/Cargo.toml # crates/trust/src/load.rs # crates/util/Cargo.toml # fapolicy-analyzer.spec # scripts/srpm/fapolicy-analyzer.spec
ctc-oss · Jan 9, 2023 · 5ab14eb · 5ab14eb
1 parent 3e42134
commit 5ab14eb
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 151 deletions.
diff --git a/.copr/Makefile b/.copr/Makefile
@@ -37,7 +37,7 @@ dnf-rpmdev:
 ifeq ($(OS_ID),rhel)
 vendor: vendor-app vendor-rs vendor-py
 else
-vendor: vendor-app vendor-rs
+vendor: vendor-app
 endif
 
 vendor-app:

diff --git a/.github/rpm-matrix.json b/.github/rpm-matrix.json
@@ -1,12 +1,5 @@
 {
   "props": [
-    {
-      "platform": "fedora",
-      "dist": "fc37",
-      "spec": "fapolicy-analyzer.spec",
-      "image": "registry.fedoraproject.org/fedora:37",
-      "chroot": "fedora-37-x86_64"
-    },
     {
       "platform": "fedora",
       "dist": "fc38",

diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
@@ -100,11 +100,17 @@ jobs:
       - name: Export tarballs
         run: |
           mkdir -p /tmp/archives
-          mv vendor-rs.$PLATFORM.tar.gz /tmp/archives
           mv fapolicy-analyzer.tar.gz /tmp/archives
         env:
           PLATFORM: ${{ matrix.props.dist }}
 
+      - name: Export Rust vendor tarball
+        if: startsWith(matrix.props.dist, 'el')
+        run: |
+          mv vendor-rs.tar.gz /tmp/archives/vendor-rs.tar.gz
+        env:
+          PLATFORM: ${{ matrix.props.dist }}
+
       - name: Upload tarballs
         uses: actions/upload-artifact@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Containerfile b/Containerfile
@@ -20,13 +20,8 @@ WORKDIR /tmp/rpmbuild
 RUN spectool -gf -C SOURCES/ SPECS/fapolicy-analyzer.spec
 
 COPY --chown=10001:0 fapolicy-analyzer.tar.gz SOURCES/
-COPY --chown=10001:0 vendor-rs.tar.gz         SOURCES/
 COPY --chown=10001:0 scripts/srpm/build.sh    ./build.sh
 
-WORKDIR /tmp/rpmbuild/SOURCES
-RUN dist=$(rpm --eval "%{?dist}") \
- && mv vendor-rs.tar.gz vendor-rs${dist}.tar.gz
-
 WORKDIR /tmp/rpmbuild
 
 ENTRYPOINT ["/tmp/rpmbuild/build.sh"]
diff --git a/crates/analyzer/Cargo.toml b/crates/analyzer/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies]
-nom = "6.1.0"
+nom = "7.1"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 chrono = "0.4.22"

diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
@@ -6,9 +6,8 @@ version = "0.4.0"
 edition = "2018"
 
 [dependencies]
-confy = "0.4.0"
-directories = "2.0.2"
-lmdb-rkv = "0.14.0"
+confy = "0.4"
+directories = "4.0"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 

diff --git a/crates/daemon/Cargo.toml b/crates/daemon/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.4.0"
 edition = "2018"
 
 [dependencies]
-nom = "6.1.0"
+nom = "7.1"
 thiserror = "1.0"
 fapolicy-trust = { version = "*", path = "../trust" }
 dbus = "0.9"
diff --git a/crates/rules/Cargo.toml b/crates/rules/Cargo.toml
@@ -12,6 +12,6 @@ path = "src/lib.rs"
 tempfile = "3.3"
 
 [dependencies]
-nom = "6.1.0"
+nom = "7.1"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
diff --git a/crates/tools/Cargo.toml b/crates/tools/Cargo.toml
@@ -15,8 +15,8 @@ path = "src/rule_check.rs"
 
 [dependencies]
 clap = { version = "3.2.20", features = ["derive"] }
-lmdb-rkv = "0.14.0"
-nom = "6.1.0"
+lmdb = "0.8"
+nom = "7.1"
 rayon = "1.5"
 thiserror = "1.0"
 ariadne = "0.1"

diff --git a/crates/trust/Cargo.toml b/crates/trust/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.4.0"
 edition = "2018"
 
 [dependencies]
-lmdb-rkv = "0.14.0"
+lmdb = "0.8"
 rayon = "1.5"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"

diff --git a/crates/trust/src/read.rs b/crates/trust/src/read.rs
@@ -59,12 +59,8 @@ pub fn load_trust_db(path: &str) -> Result<DB, Error> {
     let lookup: HashMap<String, Rec> = env
         .begin_ro_txn()
         .map(|t| {
-            t.open_ro_cursor(db).map(|mut c| {
-                c.iter()
-                    .map(|c| c.unwrap())
-                    .map(|kv| TrustPair::new(kv).into())
-                    .collect()
-            })
+            t.open_ro_cursor(db)
+                .map(|mut c| c.iter().map(|kv| TrustPair::new(kv).into()).collect())
         })
         .unwrap()
         .map_err(LmdbReadFail)