| Message ID | 20211123183249.6133-3-cgzones@googlemail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] mcstrans: port to new PCRE2 from end-of-life PCRE | expand |
Christian Göttsche <cgzones@googlemail.com> writes: > Now that libselinux defaults to PCRE2 and mcstrans has been ported, > update all documentation and scripts. > > Signed-off-by: Christian Göttsche <cgzones@googlemail.com> Acked-by: Petr Lautrbach <plautrba@redhat.com> > --- > .circleci/config.yml | 2 +- > .github/workflows/run_tests.yml | 2 +- > CONTRIBUTING.md | 2 +- > README.md | 4 ++-- > scripts/ci/fedora-test-runner.sh | 2 +- > 5 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/.circleci/config.yml b/.circleci/config.yml > index 5d3177da..af20484b 100644 > --- a/.circleci/config.yml > +++ b/.circleci/config.yml > @@ -13,7 +13,7 @@ jobs: > > # Install dependencies > - run: sudo apt-get update -qq > - - run: sudo apt-get install -qq bison clang clang-tools flex gawk gettext libaudit-dev libcap-dev libcap-ng-dev libcunit1-dev libdbus-glib-1-dev libpcre3-dev python3-dev python-dev ruby-dev swig xmlto > + - run: sudo apt-get install -qq bison clang clang-tools flex gawk gettext libaudit-dev libcap-dev libcap-ng-dev libcunit1-dev libdbus-glib-1-dev libpcre2-dev python3-dev python-dev ruby-dev swig xmlto > > - run: > name: Setup environment variables > diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml > index ef4be8af..01fbbbe5 100644 > --- a/.github/workflows/run_tests.yml > +++ b/.github/workflows/run_tests.yml > @@ -57,7 +57,7 @@ jobs: > libcap-ng-dev \ > libcunit1-dev \ > libdbus-glib-1-dev \ > - libpcre3-dev \ > + libpcre2-dev \ > python3-dev \ > python-dev \ > ruby-dev \ > diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md > index a3517cb8..7c548e58 100644 > --- a/CONTRIBUTING.md > +++ b/CONTRIBUTING.md > @@ -26,7 +26,7 @@ using a custom policy please include it as well. > There are a number of dependencies required to build the userspace > tools/libraries. On a Fedora system you can install them with yum: > > - # yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre-devel python-devel setools-devel swig ustr-devel > + # yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre2-devel python-devel setools-devel swig ustr-devel > > The tools and libraries can be built and installed under a private directory from the top level with make, e.g. > > diff --git a/README.md b/README.md > index e1c2fe64..74b0a0c3 100644 > --- a/README.md > +++ b/README.md > @@ -51,7 +51,7 @@ dnf install \ > libcap-devel \ > libcap-ng-devel \ > pam-devel \ > - pcre-devel \ > + pcre2-devel \ > xmlto > > # For Python and Ruby bindings > @@ -78,7 +78,7 @@ apt-get install --no-install-recommends --no-install-suggests \ > libcap-ng-dev \ > libcunit1-dev \ > libglib2.0-dev \ > - libpcre3-dev \ > + libpcre2-dev \ > pkgconf \ > python3 \ > python3-distutils \ > diff --git a/scripts/ci/fedora-test-runner.sh b/scripts/ci/fedora-test-runner.sh > index f817499b..3ce2c3a6 100755 > --- a/scripts/ci/fedora-test-runner.sh > +++ b/scripts/ci/fedora-test-runner.sh > @@ -36,7 +36,7 @@ dnf install -y \ > libcap-devel \ > libcap-ng-devel \ > pam-devel \ > - pcre-devel \ > + pcre2-devel \ > xmlto \ > python3-devel \ > ruby-devel \ > -- > 2.34.0
diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d3177da..af20484b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: # Install dependencies - run: sudo apt-get update -qq - - run: sudo apt-get install -qq bison clang clang-tools flex gawk gettext libaudit-dev libcap-dev libcap-ng-dev libcunit1-dev libdbus-glib-1-dev libpcre3-dev python3-dev python-dev ruby-dev swig xmlto + - run: sudo apt-get install -qq bison clang clang-tools flex gawk gettext libaudit-dev libcap-dev libcap-ng-dev libcunit1-dev libdbus-glib-1-dev libpcre2-dev python3-dev python-dev ruby-dev swig xmlto - run: name: Setup environment variables diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index ef4be8af..01fbbbe5 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -57,7 +57,7 @@ jobs: libcap-ng-dev \ libcunit1-dev \ libdbus-glib-1-dev \ - libpcre3-dev \ + libpcre2-dev \ python3-dev \ python-dev \ ruby-dev \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a3517cb8..7c548e58 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ using a custom policy please include it as well. There are a number of dependencies required to build the userspace tools/libraries. On a Fedora system you can install them with yum: - # yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre-devel python-devel setools-devel swig ustr-devel + # yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre2-devel python-devel setools-devel swig ustr-devel The tools and libraries can be built and installed under a private directory from the top level with make, e.g. diff --git a/README.md b/README.md index e1c2fe64..74b0a0c3 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ dnf install \ libcap-devel \ libcap-ng-devel \ pam-devel \ - pcre-devel \ + pcre2-devel \ xmlto # For Python and Ruby bindings @@ -78,7 +78,7 @@ apt-get install --no-install-recommends --no-install-suggests \ libcap-ng-dev \ libcunit1-dev \ libglib2.0-dev \ - libpcre3-dev \ + libpcre2-dev \ pkgconf \ python3 \ python3-distutils \ diff --git a/scripts/ci/fedora-test-runner.sh b/scripts/ci/fedora-test-runner.sh index f817499b..3ce2c3a6 100755 --- a/scripts/ci/fedora-test-runner.sh +++ b/scripts/ci/fedora-test-runner.sh @@ -36,7 +36,7 @@ dnf install -y \ libcap-devel \ libcap-ng-devel \ pam-devel \ - pcre-devel \ + pcre2-devel \ xmlto \ python3-devel \ ruby-devel \
Now that libselinux defaults to PCRE2 and mcstrans has been ported, update all documentation and scripts. Signed-off-by: Christian Göttsche <cgzones@googlemail.com> --- .circleci/config.yml | 2 +- .github/workflows/run_tests.yml | 2 +- CONTRIBUTING.md | 2 +- README.md | 4 ++-- scripts/ci/fedora-test-runner.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)