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

.copr/Makefile

@@ -38,9 +38,10 @@ dnf-rpmdev:
 	dnf install -y rpmdevtools
 
 ifeq ($(OS_ID),rhel)
+# we only need to vendor rust and python on rhel
 vendor: prep_rpmbuild_dir vendor-app vendor-doc vendor-rs vendor-py
 else
-vendor: prep_rpmbuild_dir vendor-app vendor-doc vendor-rs
+vendor: prep_rpmbuild_dir vendor-app vendor-doc
 endif
 
 vendor-app:

.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",

.github/workflows/rpm.yml

@@ -100,12 +100,18 @@ jobs:
       - name: Export tarballs
         run: |
           mkdir -p /tmp/archives
-          mv vendor-rs.tar.gz         /tmp/archives/vendor-rs.$PLATFORM.tar.gz
           mv vendor-docs.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:
@@ -224,24 +230,14 @@ jobs:
         with:
           path: /tmp/archives/
 
-      - name: Release Spec File
-        run: |
-          out=/tmp/archives/fapolicy-analyzer.spec
-          base=https://github.com/$GITHUB_REPOSITORY/releases/download/${{ steps.tag_name.outputs.VERSION }}
-          cp fapolicy-analyzer.spec $out
-          sed -z -i -e "s#fapolicy-analyzer.tar.gz#$base/fapolicy-analyzer.tar.gz#" $out
-          sed -z -i -e "s#vendor-docs.tar.gz#$base/vendor-docs.tar.gz#" $out
-          sed -z -i -e "s#vendor-rs.tar.gz#$base/vendor-rs.tar.gz#" $out
-          sed    -i -e "s#vendor-rs.tar.gz#vendor-rs%{?dist}.tar.gz#" $out
-
       - name: Release artifacts
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ steps.tag_name.outputs.VERSION }}
           prerelease: ${{ startsWith(github.ref, 'refs/tags/v0') || contains(github.ref, 'rc') }}
           draft: true
           files: |
-            /tmp/archives/*.spec
+            ${{ matrix.props.spec }}
             /tmp/archives/rpm-artifacts/*.rpm
             /tmp/archives/srpm-artifacts/*.src.rpm
             /tmp/archives/tarball-artifacts/*.tar.gz

Containerfile

@@ -20,7 +20,6 @@ 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 vendor-docs.tar.gz       SOURCES/
 COPY --chown=10001:0 scripts/srpm/build.sh    ./build.sh
 

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"

crates/app/Cargo.toml

@@ -6,9 +6,8 @@ version = "0.4.1"
 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"
 

crates/daemon/Cargo.toml

@@ -6,7 +6,7 @@ version = "0.5.0"
 edition = "2018"
 
 [dependencies]
-nom = "6.1.0"
+nom = "7.1"
 thiserror = "1.0"
 fapolicy-trust = { version = "*", path = "../trust" }
 fapolicy-rules = { version = "*", path = "../rules" }

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"

crates/tools/Cargo.toml

@@ -19,8 +19,8 @@ path = "src/fapolicy_profiler.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"