diff --git a/.github/workflows/axosyslog-create-packages.yml b/.github/workflows/axosyslog-create-packages.yml deleted file mode 100644 index 68e371f8e2..0000000000 --- a/.github/workflows/axosyslog-create-packages.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: AxoSyslog create packages from source tarball - -on: - workflow_call: - inputs: - source-tarball-artifact-name: - required: true - type: string - dbld-image-mode: - required: true - type: string # cache / build - distros: - required: false - type: string - default: | - [ - "almalinux-8", - ] - -jobs: - create-packages: - name: ${{ matrix.distro }} - - runs-on: ubuntu-latest - - strategy: - matrix: - distro: ${{ fromJson(inputs.distros) }} - fail-fast: false - - steps: - - name: Download source tarball artifact - uses: actions/download-artifact@v4 - with: - name: ${{ inputs.source-tarball-artifact-name }} - - - name: Extract source tarball - run: | - mkdir axosyslog - tar --strip-components=1 -xvf axosyslog*.tar.gz -C axosyslog - - - name: Prepare docker image - working-directory: axosyslog - run: | - if [[ "${{ inputs.dbld-image-mode }}" = "build" ]] - then - ./dbld/rules image-${{ matrix.distro }} - elif [[ "${{ inputs.dbld-image-mode }}" = "cache" ]] - then - ./dbld/rules cache-image-${{ matrix.distro }} - else - echo Unexpected input: dbld-image-mode=${{ inputs.dbld-image-mode }} - false - fi - - - name: Create package - working-directory: axosyslog - run: | - ./dbld/rules package-${{ matrix.distro }} - - - name: Prepare package for artifact - # We want to keep the directory structure starting with ${{ matrix.distro }}, - # but it can only be done, if we give its parent directory as `path` to upload-artifact. - # There are other directories in dbld/build which we do not want to upload, - # so let's make a temporary directory and move the ${{ matrix.distro }} directory there. - run: | - mkdir package - cp -r axosyslog/dbld/build/${{ matrix.distro }} package/ - - - name: Store package as artifact - uses: actions/upload-artifact@v3 - with: - name: package-${{ matrix.distro }} - path: package/* - if-no-files-found: error diff --git a/.github/workflows/axosyslog-docker.yml b/.github/workflows/axosyslog-docker.yml index ce074fdb0d..500c965685 100644 --- a/.github/workflows/axosyslog-docker.yml +++ b/.github/workflows/axosyslog-docker.yml @@ -88,7 +88,7 @@ jobs: tags: ${{ steps.tags.outputs.TAGS }} # description should be here because it is a multi-arch image # see docs: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images - outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.docker-metadata-tags.outputs.json).labels['org.opencontainers.image.description'] }} + outputs: type=image,name=${{ env.DOCKER_IMAGE_NAME }},annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.docker-metadata-tags.outputs.json).labels['org.opencontainers.image.description'] }} build-args: | PKG_TYPE=${{ inputs.pkg-type }} SNAPSHOT_VERSION=${{ inputs.snapshot-version }} diff --git a/.github/workflows/axosyslog-packages.yml b/.github/workflows/axosyslog-packages.yml deleted file mode 100644 index ea8377af43..0000000000 --- a/.github/workflows/axosyslog-packages.yml +++ /dev/null @@ -1,85 +0,0 @@ -# TODO rewrite rpm and deb packaging for AxoSyslog and remove this job (use "create-packages" instead) -name: AxoSyslog packages -on: - workflow_call: - inputs: - repo: - description: 'AxoSyslog repository' - required: true - default: 'axoflow/axosyslog' - type: string - version: - description: 'AxoSyslog version' - required: true - type: string - - workflow_dispatch: - inputs: - repo: - description: 'AxoSyslog repository' - required: true - default: 'axoflow/axosyslog' - type: string - version: - description: 'AxoSyslog version' - required: true - type: string - -jobs: - create-source-tarball: - runs-on: ubuntu-latest - steps: - - name: Get AxoSyslog tarball - env: - GH_TOKEN: ${{ github.token }} - run: | - gh release download --repo '${{ inputs.repo }}' -p 'axosyslog-${{ inputs.version }}.tar.gz' 'axosyslog-${{ inputs.version }}' - - - name: Extract source tarball - run: | - mkdir axosyslog - tar --strip-components=1 -xvf axosyslog*.tar.gz -C axosyslog - rm axosyslog*.tar.gz - - - name: AxoSyslog patches - working-directory: axosyslog - run: | - sed -i 's/Name: syslog-ng/Name: axosyslog/' packaging/rhel/syslog-ng.spec - sed -i 's|%{name}-%{version}.tar.gz|syslog-ng-%{version}.tar.gz|' packaging/rhel/syslog-ng.spec - sed -i 's|URL.*|URL: https://axoflow.com/docs/axosyslog-core/|' packaging/rhel/syslog-ng.spec - sed -i 's|Provides: syslog|&\n\nConflicts: syslog-ng\nConflicts: syslog-ng-premium-edition|' packaging/rhel/syslog-ng.spec - sed -i 's|%setup -q|%setup -q -n syslog-ng-%{version}|' packaging/rhel/syslog-ng.spec - sed -i 's|/%{name}|/syslog-ng|g' packaging/rhel/syslog-ng.spec - sed -i 's|/lib%{name}|/libsyslog-ng|g' packaging/rhel/syslog-ng.spec - sed -i 's|^.*czanik/syslog-ng-githead.*$||' dbld/builddeps - - # Remove extra dependencies - sed -i 's|almalinux.*|&,nocriterion,noriemann,nokafka,nomqtt,nojava|' dbld/build.manifest - - cat packaging/rhel/syslog-ng.spec - - - name: Prepare docker image - working-directory: axosyslog - run: ./dbld/rules cache-image-tarball - - - name: Create source tarball - working-directory: axosyslog - run: ./dbld/rules pkg-tarball - - - name: Store source tarball as artifact - uses: actions/upload-artifact@v4 - with: - name: source-tarball - path: axosyslog/dbld/build/*.tar.* - if-no-files-found: error - - create-packages: - needs: create-source-tarball - uses: ./.github/workflows/axosyslog-create-packages.yml - with: - source-tarball-artifact-name: source-tarball - dbld-image-mode: cache - distros: | - [ - "almalinux-8" - ] diff --git a/.github/workflows/comment-cfg-grammar-changes.yml b/.github/workflows/comment-cfg-grammar-changes.yml index 0fb28580f2..6e4bbe3ce1 100644 --- a/.github/workflows/comment-cfg-grammar-changes.yml +++ b/.github/workflows/comment-cfg-grammar-changes.yml @@ -18,7 +18,7 @@ jobs: # The download-artifact action cannot download artifacts from other workflows. # Copied from https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run - name: Download comment artifact - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({ diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml index 1bbe29d25f..2fc71ba6aa 100644 --- a/.github/workflows/create-packages.yml +++ b/.github/workflows/create-packages.yml @@ -41,7 +41,7 @@ jobs: steps: - name: Download source tarball artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ inputs.source-tarball-artifact-name }} @@ -79,7 +79,7 @@ jobs: cp -r axosyslog/dbld/build/${{ matrix.distro }} package/ - name: Store package as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: package-${{ matrix.distro }} path: package/* diff --git a/.github/workflows/devshell.yml b/.github/workflows/devshell.yml index 00b6e6318f..101aab6d5d 100644 --- a/.github/workflows/devshell.yml +++ b/.github/workflows/devshell.yml @@ -106,7 +106,7 @@ jobs: run: make VERBOSE=1 func-test - name: "Artifact: test-suite.log" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() && steps.make_check.outcome == 'failure' with: name: test-suite-${{ matrix.build-tool }}-${{ matrix.cc }} @@ -122,7 +122,7 @@ jobs: tar -cz -f /tmp/light-reports.tar.gz /tmp/light-reports - name: "Artifact: light-reports" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() && steps.prepare-light-reports.outcome == 'success' with: name: light-reports-${{ matrix.build-tool }}-${{ matrix.cc }} @@ -136,7 +136,7 @@ jobs: gdb --ex="thread apply all bt full" --ex="quit" ${SYSLOG_NG_INSTALL_DIR}/sbin/syslog-ng --core {} \; - name: "Artifact: corefiles" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: corefiles-${{ matrix.build-tool }}-${{ matrix.cc }} @@ -228,14 +228,14 @@ jobs: (git diff > ../light-style-problems.diff ; git reset --hard HEAD && exit 1) - name: "Artifact: c-style-problems" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() && steps.c-style-check.outcome == 'failure' with: name: c-style-problems path: c-style-problems.diff - name: "Artifact: light-style-problems" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() && steps.light-style-check.outcome == 'failure' with: name: light-style-problems @@ -259,7 +259,7 @@ jobs: run: tests/copyright/check.sh . . - name: "Artifact: copyright-run.log" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: copyright-run.log diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 25452ca801..02a3118abc 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -69,7 +69,7 @@ jobs: ./dbld/rules release VERSION=${VERSION} - name: Store release tarball as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: release-tarball path: ${{ env.TARBALL_PATH }} @@ -98,7 +98,7 @@ jobs: uses: actions/checkout@v4 - name: Download release tarball artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: release-tarball diff --git a/.github/workflows/index-packages.yml b/.github/workflows/index-packages.yml index 16b62da607..0a6fb564f2 100644 --- a/.github/workflows/index-packages.yml +++ b/.github/workflows/index-packages.yml @@ -82,7 +82,7 @@ jobs: rm -f "${GPG_KEY_PATH}" - name: "Artifact: verbose run log" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: ${{ env.VERBOSE_LOG_PATH }} diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 2c3d701473..73cd64ca05 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -22,7 +22,7 @@ jobs: run: ./dbld/rules pkg-tarball - name: Store source tarball as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: source-tarball path: dbld/build/*.tar.gz diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 2a82705bc0..24a4697c43 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -69,19 +69,10 @@ jobs: name: axosyslog-modules needs: find-draft-release-run runs-on: ubuntu-latest - outputs: - version: ${{ steps.unpack_tag.outputs.group1 }} steps: - name: Checkout source uses: actions/checkout@v4 - - name: Regex matching - uses: kaisugi/action-regex-match@v1.0.0 - id: unpack_tag - with: - text: ${{ github.ref }} - regex: 'refs/tags/axosyslog-(.*)' - - name: Create AxoSyslog modules tarball working-directory: docker run: | @@ -93,13 +84,6 @@ jobs: name: axosyslog-modules-tarball path: docker/python-modules.tar.gz - publish-packages: - uses: ./.github/workflows/axosyslog-packages.yml - needs: axosyslog-modules - with: - repo: axoflow/axosyslog - version: ${{ needs.axosyslog-modules.outputs.version }} - publish-image: uses: ./.github/workflows/axosyslog-docker.yml needs: axosyslog-modules diff --git a/.github/workflows/upload-packages.yml b/.github/workflows/upload-packages.yml index 43ce084c74..614b51a3ed 100644 --- a/.github/workflows/upload-packages.yml +++ b/.github/workflows/upload-packages.yml @@ -41,7 +41,7 @@ jobs: steps: - name: Download package artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: package-${{ matrix.distro }} path: package diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 107a5effad..d38bab3606 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -78,7 +78,7 @@ jobs: ./dbld/rules release VERSION=${RELEASE_VERSION} - name: Upload tarball - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: axosyslog-${{ env.RELEASE_VERSION }} path: dbld/release/${{ env.RELEASE_VERSION }}/axosyslog-${{ env.RELEASE_VERSION }}.tar.gz diff --git a/dbld/build.manifest b/dbld/build.manifest index 42ea4d4502..cce5885ef3 100644 --- a/dbld/build.manifest +++ b/dbld/build.manifest @@ -42,4 +42,4 @@ ubuntu-lunar python3 ubuntu-mantic python3 fedora python3 -almalinux python3 +almalinux python3,noriemann,nokafka,nomqtt,nojava diff --git a/dbld/builddeps b/dbld/builddeps index 9c6d58f8b8..5f2e0083a4 100755 --- a/dbld/builddeps +++ b/dbld/builddeps @@ -114,12 +114,10 @@ function add_copr_repo { case "${OS_DISTRIBUTION}" in centos|almalinux) $YUM_INSTALL yum-plugin-copr - yum copr enable -y czanik/syslog-ng-githead yum config-manager --set-enabled powertools ;; fedora) $DNF_INSTALL -y dnf-plugins-core - dnf copr enable -y czanik/syslog-ng-githead ;; esac } @@ -143,9 +141,9 @@ function install_debian_build_deps { } function install_rpm_build_deps { - RPM_SPEC_FILE="${DBLD_DIR}/extra-files/${IMAGE_PLATFORM}/syslog-ng.spec" + RPM_SPEC_FILE="${DBLD_DIR}/extra-files/${IMAGE_PLATFORM}/axosyslog.spec" if ! [ -f ${RPM_SPEC_FILE} ]; then - echo "install_rpm_build_deps() called from dockerfile but without a syslog-ng.spec file, make sure that control file is copied over to ${RPM_SPEC_FILE} by the prepare step" + echo "install_rpm_build_deps() called from dockerfile but without an axosyslog.spec file, make sure that control file is copied over to ${RPM_SPEC_FILE} by the prepare step" exit 1 fi diff --git a/dbld/generate-rpm-specfile b/dbld/generate-rpm-specfile index 758fc19478..b0ea7596d3 100755 --- a/dbld/generate-rpm-specfile +++ b/dbld/generate-rpm-specfile @@ -5,14 +5,14 @@ MODE=$1 if [ $MODE = "snapshot" ]; then - echo "Generating snapshot version in syslog-ng.spec" + echo "Generating snapshot version in axosyslog.spec" sed -e "s/^Version: \([0-9.]\+\).*$/Version: $VERSION/" \ - -e "s/^Release: \([0-9.]\+\).*$/Release: \1+`date +%Y%m%dT%H%M%S`/" -i packaging/rhel/syslog-ng.spec + -e "s/^Release: \([0-9.]\+\).*$/Release: \1+`date +%Y%m%dT%H%M%S`/" -i packaging/rhel/axosyslog.spec elif [ $MODE = "release" ]; then echo "Validating that your RPM specfile matches the current version" - RPM_VERSION=`grep ^Version packaging/rhel/syslog-ng.spec | cut -d ' ' -f2` + RPM_VERSION=`grep ^Version packaging/rhel/axosyslog.spec | cut -d ' ' -f2` if [ "${RPM_VERSION}" != "${VERSION}" ]; then - echo "The version numbers in syslog-ng.spec do not match the current version number. Cannot generate a release tarball this way" + echo "The version numbers in axosyslog.spec do not match the current version number. Cannot generate a release tarball this way" exit 1 fi fi diff --git a/dbld/images/almalinux.prepare.sh b/dbld/images/almalinux.prepare.sh index 5b43b43911..e1bc51b4f5 100644 --- a/dbld/images/almalinux.prepare.sh +++ b/dbld/images/almalinux.prepare.sh @@ -1,3 +1,3 @@ #!/bin/sh -cp packaging/rhel/syslog-ng.spec ${EXTRA_FILES_DIR}/syslog-ng.spec +cp packaging/rhel/axosyslog.spec ${EXTRA_FILES_DIR}/axosyslog.spec diff --git a/dbld/images/centos.prepare.sh b/dbld/images/centos.prepare.sh index 5b43b43911..e1bc51b4f5 100644 --- a/dbld/images/centos.prepare.sh +++ b/dbld/images/centos.prepare.sh @@ -1,3 +1,3 @@ #!/bin/sh -cp packaging/rhel/syslog-ng.spec ${EXTRA_FILES_DIR}/syslog-ng.spec +cp packaging/rhel/axosyslog.spec ${EXTRA_FILES_DIR}/axosyslog.spec diff --git a/dbld/images/fedora.prepare.sh b/dbld/images/fedora.prepare.sh index 5b43b43911..e1bc51b4f5 100644 --- a/dbld/images/fedora.prepare.sh +++ b/dbld/images/fedora.prepare.sh @@ -1,3 +1,3 @@ #!/bin/sh -cp packaging/rhel/syslog-ng.spec ${EXTRA_FILES_DIR}/syslog-ng.spec +cp packaging/rhel/axosyslog.spec ${EXTRA_FILES_DIR}/axosyslog.spec diff --git a/dbld/prepare-release b/dbld/prepare-release index 70acadd688..a16a68bc07 100755 --- a/dbld/prepare-release +++ b/dbld/prepare-release @@ -33,12 +33,16 @@ function update_packaging_debian() { function update_packaging_rhel() { echo Updating RHEL packaging - sed -i -e "s/^Version: [0-9.]*$/Version: $VERSION/g" packaging/rhel/syslog-ng.spec - sed -i -e "/^%changelog/ a * `date '+%a %b %e %Y'` $USER_NAME <$USER_EMAIL> - $VERSION-1\n- updated to $VERSION\n" packaging/rhel/syslog-ng.spec + sed -i -e "s/^Version: [0-9.]*$/Version: $VERSION/g" packaging/rhel/axosyslog.spec + sed -i -e "/^%changelog/ a * `date '+%a %b %e %Y'` $USER_NAME <$USER_EMAIL> - $VERSION-1\n- updated to $VERSION\n" packaging/rhel/axosyslog.spec } function update_version_refs_in_source() { echo Updating version references in source files + ESCAPED_OLD_MAJOR_AND_MINOR_AND_PATCH=$(echo $OLD_MAJOR.$OLD_MINOR.$OLD_PATCH | sed -e 's/[]\/$*.^[]/\\&/g') && + ESCAPED_NEW_MAJOR_AND_MINOR_AND_PATCH=$(echo $NEW_MAJOR.$NEW_MINOR.$NEW_PATCH | sed -e 's/[\/&]/\\&/g') && + git ls-files README.md docker/apkbuild/axoflow/axosyslog/APKBUILD | xargs sed -i "s/$ESCAPED_OLD_MAJOR_AND_MINOR_AND_PATCH/$ESCAPED_NEW_MAJOR_AND_MINOR_AND_PATCH/g" + ESCAPED_OLD_MAJOR_AND_MINOR=$(echo $OLD_MAJOR.$OLD_MINOR | sed -e 's/[]\/$*.^[]/\\&/g') && ESCAPED_NEW_MAJOR_AND_MINOR=$(echo $NEW_MAJOR.$NEW_MINOR | sed -e 's/[\/&]/\\&/g') && git ls-files $VERSION_FILE_LIST | xargs sed -i "s/$ESCAPED_OLD_MAJOR_AND_MINOR/$ESCAPED_NEW_MAJOR_AND_MINOR/g" diff --git a/dbld/rules b/dbld/rules index 12f737f3cc..63ea95849b 100755 --- a/dbld/rules +++ b/dbld/rules @@ -229,7 +229,7 @@ pull-image-%: cache-image-%: @IMAGE=${CONTAINER_REGISTRY}/axosyslog-dbld-$*:latest; \ IMAGE_ID=$$($(DOCKER) images -q $$IMAGE | head -1); \ - WATCHED_FILES="dbld packaging/rhel/syslog-ng.spec packaging/debian/control"; \ + WATCHED_FILES="dbld packaging/rhel/axosyslog.spec packaging/debian/control"; \ if [ "$$IMAGE_ID" = "" ]; then \ $(DBLD_RULES) pull-image-$*; \ fi; \ diff --git a/modules/python-modules/README.md b/modules/python-modules/README.md index 20d0966757..08495bed70 100644 --- a/modules/python-modules/README.md +++ b/modules/python-modules/README.md @@ -658,5 +658,5 @@ captures all Python modules in the `syslog-ng-python` package without having to list them explicitly. If you need to customize installation, you can find our spec file in -`packaging/rhel/syslog-ng.spec` which is populated and copied to the root at +`packaging/rhel/axosyslog.spec` which is populated and copied to the root at tarball creation. diff --git a/packaging/README.md b/packaging/README.md index af3c02d537..b66d610b8d 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -108,7 +108,7 @@ build dependency. This term would be mapped into a Debian profile named ### RHEL To add a new build dependency in case of RPM based distros (centos, fedora), -you need to change the file `packaging/rhel/syslog-ng.spec`. You need to add +you need to change the file `packaging/rhel/axosyslog.spec`. You need to add a BuildRequires line like this: ``` @@ -202,7 +202,7 @@ created at build time. ### RHEL -With rpm packaging you will need to change `packaging/rhel/syslog-ng.spec` +With rpm packaging you will need to change `packaging/rhel/axosyslog.spec` file and add a `%package` stanza somewhere around the other similar packages: diff --git a/packaging/debian/README.source b/packaging/debian/README.source index 4134811e21..5a6ec82730 100644 --- a/packaging/debian/README.source +++ b/packaging/debian/README.source @@ -1,7 +1,7 @@ -syslog-ng Debian sources +AxoSyslog Debian sources ======================== -This is the Debian packaging of syslog-ng. It is a non-trivial +This is the Debian packaging of AxoSyslog. It is a non-trivial packaging, not for the faint of heart, but rest assured, every quirk, every strange solution is there for a reason, and this document is here to explain the details. @@ -15,25 +15,25 @@ documented there. If there is conflict between this document and ### Maintainer scripts -Both syslog-ng-core, and a few of the older modules have maintainer +Both axosyslog-core, and a few of the older modules have maintainer scripts, for various purposes. -In the case of **syslog-ng-core**, the `postrm` takes care of +In the case of **axosyslog-core**, the `postrm` takes care of disabling (on remove) or removing (on purge) the logrotate configuration files, and also removes the control socket and the persist file, along with the `/var/lib/syslog-ng` directory, if it is empty. -The `preinst` for **syslog-ng-core** restores any disabled logrotate +The `preinst` for **axosyslog-core** restores any disabled logrotate configs, and if upgrading from a version that had symlinked conffiles, removes those too, before unpacking the upgrade. -And the last maintainer script of **syslog-ng-core**, the `prerm` +And the last maintainer script of **axosyslog-core**, the `prerm` stops the `syslog.socket` if using systemd, so that we do not get re-enabled by socket activation during remove. -Some module packages, namely **syslog-ng-mod-json**, -**syslog-ng-mod-sql**, and **syslog-ng-mod-mongodb** also have a +Some module packages, namely **axosyslog-mod-json**, +**axosyslog-mod-sql**, and **axosyslog-mod-mongodb** also have a `postinst`, which removes the old activation conffile that shipped with syslog-ng versions prior to 3.4 @@ -46,7 +46,7 @@ configuration snippet, that declares a syslog-ng variable with the appropriate value. On kFreeBSD, we install one version, on Linux, another. This is done -from debian/syslog-ng-core.install, via `dh-exec`. +from debian/axosyslog-core.install, via `dh-exec`. This way, the main configuration file remains the same on all architectures, only this little snippet changes, which makes it easier @@ -55,7 +55,7 @@ to maintain the whole. ### Shared library ABI versions Upstream builds a `libsyslog-ng-$MAJOR.so.$N` shared library, which we -ship in `syslog-ng-core`, because it is not a general purpose library. +ship in `axosyslog-core`, because it is not a general purpose library. ### Control variables @@ -63,8 +63,8 @@ We have three custom control variables, which are referenced by `debian/control`: **${sng:CoreModules}**, and **${sng:Modules}**. They will be used for dependencies. -The `syslog-ng` meta package has to depend on core modules, because at -some point in the past, they were part of the monolithic `syslog-ng` +The `axosyslog` meta package has to depend on core modules, because at +some point in the past, they were part of the monolithic `axosyslog` package, and for smooth upgrades, we need to keep all formerly installed modules installed. Being a meta package, it also recommends the other modules. @@ -72,7 +72,7 @@ the other modules. The list of Core modules is a hard-coded list (**sql**, **mongodb**, **json**), but the optional modules are generated at build time, by looking at `debian/control` and finding all packages with names -starting with `syslog-ng-mod-`. +starting with `axosyslog-mod-`. We use the `debian/tools/list-modules.sh` script to construct these lists for us, and in `debian/rules`, we override `dh_gencontrol` to diff --git a/packaging/debian/syslog-ng-core.NEWS b/packaging/debian/axosyslog-core.NEWS similarity index 100% rename from packaging/debian/syslog-ng-core.NEWS rename to packaging/debian/axosyslog-core.NEWS diff --git a/packaging/debian/syslog-ng-core.dirs b/packaging/debian/axosyslog-core.dirs similarity index 100% rename from packaging/debian/syslog-ng-core.dirs rename to packaging/debian/axosyslog-core.dirs diff --git a/packaging/debian/syslog-ng-core.install b/packaging/debian/axosyslog-core.install similarity index 100% rename from packaging/debian/syslog-ng-core.install rename to packaging/debian/axosyslog-core.install diff --git a/packaging/debian/syslog-ng-core.manpages b/packaging/debian/axosyslog-core.manpages similarity index 100% rename from packaging/debian/syslog-ng-core.manpages rename to packaging/debian/axosyslog-core.manpages diff --git a/packaging/debian/syslog-ng-core.postrm b/packaging/debian/axosyslog-core.postrm similarity index 100% rename from packaging/debian/syslog-ng-core.postrm rename to packaging/debian/axosyslog-core.postrm diff --git a/packaging/debian/syslog-ng-core.preinst b/packaging/debian/axosyslog-core.preinst similarity index 100% rename from packaging/debian/syslog-ng-core.preinst rename to packaging/debian/axosyslog-core.preinst diff --git a/packaging/debian/syslog-ng-core.prerm b/packaging/debian/axosyslog-core.prerm similarity index 100% rename from packaging/debian/syslog-ng-core.prerm rename to packaging/debian/axosyslog-core.prerm diff --git a/packaging/debian/syslog-ng-core.syslog-ng.default b/packaging/debian/axosyslog-core.syslog-ng.default similarity index 100% rename from packaging/debian/syslog-ng-core.syslog-ng.default rename to packaging/debian/axosyslog-core.syslog-ng.default diff --git a/packaging/debian/syslog-ng-core.syslog-ng.init b/packaging/debian/axosyslog-core.syslog-ng.init similarity index 100% rename from packaging/debian/syslog-ng-core.syslog-ng.init rename to packaging/debian/axosyslog-core.syslog-ng.init diff --git a/packaging/debian/syslog-ng-core.syslog-ng.logcheck.ignore.paranoid b/packaging/debian/axosyslog-core.syslog-ng.logcheck.ignore.paranoid similarity index 100% rename from packaging/debian/syslog-ng-core.syslog-ng.logcheck.ignore.paranoid rename to packaging/debian/axosyslog-core.syslog-ng.logcheck.ignore.paranoid diff --git a/packaging/debian/syslog-ng-core.syslog-ng.logcheck.ignore.server b/packaging/debian/axosyslog-core.syslog-ng.logcheck.ignore.server similarity index 100% rename from packaging/debian/syslog-ng-core.syslog-ng.logcheck.ignore.server rename to packaging/debian/axosyslog-core.syslog-ng.logcheck.ignore.server diff --git a/packaging/debian/syslog-ng-core.syslog-ng.logcheck.violations.ignore b/packaging/debian/axosyslog-core.syslog-ng.logcheck.violations.ignore similarity index 100% rename from packaging/debian/syslog-ng-core.syslog-ng.logcheck.violations.ignore rename to packaging/debian/axosyslog-core.syslog-ng.logcheck.violations.ignore diff --git a/packaging/debian/syslog-ng-core.syslog-ng.logrotate b/packaging/debian/axosyslog-core.syslog-ng.logrotate similarity index 100% rename from packaging/debian/syslog-ng-core.syslog-ng.logrotate rename to packaging/debian/axosyslog-core.syslog-ng.logrotate diff --git a/packaging/debian/syslog-ng-core.syslog-ng.upstart b/packaging/debian/axosyslog-core.syslog-ng.upstart similarity index 100% rename from packaging/debian/syslog-ng-core.syslog-ng.upstart rename to packaging/debian/axosyslog-core.syslog-ng.upstart diff --git a/packaging/debian/syslog-ng-dev.install b/packaging/debian/axosyslog-dev.install similarity index 100% rename from packaging/debian/syslog-ng-dev.install rename to packaging/debian/axosyslog-dev.install diff --git a/packaging/debian/syslog-ng-mod-add-contextual-data.install b/packaging/debian/axosyslog-mod-add-contextual-data.install similarity index 100% rename from packaging/debian/syslog-ng-mod-add-contextual-data.install rename to packaging/debian/axosyslog-mod-add-contextual-data.install diff --git a/packaging/debian/syslog-ng-mod-amqp.docs b/packaging/debian/axosyslog-mod-amqp.docs similarity index 100% rename from packaging/debian/syslog-ng-mod-amqp.docs rename to packaging/debian/axosyslog-mod-amqp.docs diff --git a/packaging/debian/syslog-ng-mod-amqp.install b/packaging/debian/axosyslog-mod-amqp.install similarity index 100% rename from packaging/debian/syslog-ng-mod-amqp.install rename to packaging/debian/axosyslog-mod-amqp.install diff --git a/packaging/debian/syslog-ng-mod-cloud-auth.install b/packaging/debian/axosyslog-mod-cloud-auth.install similarity index 100% rename from packaging/debian/syslog-ng-mod-cloud-auth.install rename to packaging/debian/axosyslog-mod-cloud-auth.install diff --git a/packaging/debian/syslog-ng-mod-common.maintscript b/packaging/debian/axosyslog-mod-common.maintscript similarity index 100% rename from packaging/debian/syslog-ng-mod-common.maintscript rename to packaging/debian/axosyslog-mod-common.maintscript diff --git a/packaging/debian/syslog-ng-mod-elastic.install b/packaging/debian/axosyslog-mod-elastic.install similarity index 100% rename from packaging/debian/syslog-ng-mod-elastic.install rename to packaging/debian/axosyslog-mod-elastic.install diff --git a/packaging/debian/syslog-ng-mod-examples.install b/packaging/debian/axosyslog-mod-examples.install similarity index 100% rename from packaging/debian/syslog-ng-mod-examples.install rename to packaging/debian/axosyslog-mod-examples.install diff --git a/packaging/debian/syslog-ng-mod-geoip2.install b/packaging/debian/axosyslog-mod-geoip2.install similarity index 100% rename from packaging/debian/syslog-ng-mod-geoip2.install rename to packaging/debian/axosyslog-mod-geoip2.install diff --git a/packaging/debian/syslog-ng-mod-getent.install b/packaging/debian/axosyslog-mod-getent.install similarity index 100% rename from packaging/debian/syslog-ng-mod-getent.install rename to packaging/debian/axosyslog-mod-getent.install diff --git a/packaging/debian/syslog-ng-mod-graphite.install b/packaging/debian/axosyslog-mod-graphite.install similarity index 100% rename from packaging/debian/syslog-ng-mod-graphite.install rename to packaging/debian/axosyslog-mod-graphite.install diff --git a/packaging/debian/syslog-ng-mod-grpc.install b/packaging/debian/axosyslog-mod-grpc.install similarity index 100% rename from packaging/debian/syslog-ng-mod-grpc.install rename to packaging/debian/axosyslog-mod-grpc.install diff --git a/packaging/debian/syslog-ng-mod-hdfs.install b/packaging/debian/axosyslog-mod-hdfs.install similarity index 100% rename from packaging/debian/syslog-ng-mod-hdfs.install rename to packaging/debian/axosyslog-mod-hdfs.install diff --git a/packaging/debian/syslog-ng-mod-http.install b/packaging/debian/axosyslog-mod-http.install similarity index 100% rename from packaging/debian/syslog-ng-mod-http.install rename to packaging/debian/axosyslog-mod-http.install diff --git a/packaging/debian/syslog-ng-mod-java-common-lib.install b/packaging/debian/axosyslog-mod-java-common-lib.install similarity index 100% rename from packaging/debian/syslog-ng-mod-java-common-lib.install rename to packaging/debian/axosyslog-mod-java-common-lib.install diff --git a/packaging/debian/syslog-ng-mod-java-http.install b/packaging/debian/axosyslog-mod-java-http.install similarity index 100% rename from packaging/debian/syslog-ng-mod-java-http.install rename to packaging/debian/axosyslog-mod-java-http.install diff --git a/packaging/debian/syslog-ng-mod-java.install b/packaging/debian/axosyslog-mod-java.install similarity index 100% rename from packaging/debian/syslog-ng-mod-java.install rename to packaging/debian/axosyslog-mod-java.install diff --git a/packaging/debian/syslog-ng-mod-kafka.install b/packaging/debian/axosyslog-mod-kafka.install similarity index 100% rename from packaging/debian/syslog-ng-mod-kafka.install rename to packaging/debian/axosyslog-mod-kafka.install diff --git a/packaging/debian/syslog-ng-mod-map-value-pairs.install b/packaging/debian/axosyslog-mod-map-value-pairs.install similarity index 100% rename from packaging/debian/syslog-ng-mod-map-value-pairs.install rename to packaging/debian/axosyslog-mod-map-value-pairs.install diff --git a/packaging/debian/syslog-ng-mod-mongodb.install b/packaging/debian/axosyslog-mod-mongodb.install similarity index 100% rename from packaging/debian/syslog-ng-mod-mongodb.install rename to packaging/debian/axosyslog-mod-mongodb.install diff --git a/packaging/debian/syslog-ng-mod-mongodb.postinst b/packaging/debian/axosyslog-mod-mongodb.postinst similarity index 100% rename from packaging/debian/syslog-ng-mod-mongodb.postinst rename to packaging/debian/axosyslog-mod-mongodb.postinst diff --git a/packaging/debian/syslog-ng-mod-mongodb.postrm b/packaging/debian/axosyslog-mod-mongodb.postrm similarity index 100% rename from packaging/debian/syslog-ng-mod-mongodb.postrm rename to packaging/debian/axosyslog-mod-mongodb.postrm diff --git a/packaging/debian/syslog-ng-mod-mongodb.preinst b/packaging/debian/axosyslog-mod-mongodb.preinst similarity index 100% rename from packaging/debian/syslog-ng-mod-mongodb.preinst rename to packaging/debian/axosyslog-mod-mongodb.preinst diff --git a/packaging/debian/syslog-ng-mod-mqtt.install b/packaging/debian/axosyslog-mod-mqtt.install similarity index 100% rename from packaging/debian/syslog-ng-mod-mqtt.install rename to packaging/debian/axosyslog-mod-mqtt.install diff --git a/packaging/debian/syslog-ng-mod-python.install b/packaging/debian/axosyslog-mod-python.install similarity index 100% rename from packaging/debian/syslog-ng-mod-python.install rename to packaging/debian/axosyslog-mod-python.install diff --git a/packaging/debian/syslog-ng-mod-python.postinst b/packaging/debian/axosyslog-mod-python.postinst similarity index 100% rename from packaging/debian/syslog-ng-mod-python.postinst rename to packaging/debian/axosyslog-mod-python.postinst diff --git a/packaging/debian/syslog-ng-mod-rdkafka.install b/packaging/debian/axosyslog-mod-rdkafka.install similarity index 100% rename from packaging/debian/syslog-ng-mod-rdkafka.install rename to packaging/debian/axosyslog-mod-rdkafka.install diff --git a/packaging/debian/syslog-ng-mod-redis.install b/packaging/debian/axosyslog-mod-redis.install similarity index 100% rename from packaging/debian/syslog-ng-mod-redis.install rename to packaging/debian/axosyslog-mod-redis.install diff --git a/packaging/debian/syslog-ng-mod-riemann.install b/packaging/debian/axosyslog-mod-riemann.install similarity index 100% rename from packaging/debian/syslog-ng-mod-riemann.install rename to packaging/debian/axosyslog-mod-riemann.install diff --git a/packaging/debian/syslog-ng-mod-slog.install b/packaging/debian/axosyslog-mod-slog.install similarity index 100% rename from packaging/debian/syslog-ng-mod-slog.install rename to packaging/debian/axosyslog-mod-slog.install diff --git a/packaging/debian/syslog-ng-mod-slog.manpages b/packaging/debian/axosyslog-mod-slog.manpages similarity index 100% rename from packaging/debian/syslog-ng-mod-slog.manpages rename to packaging/debian/axosyslog-mod-slog.manpages diff --git a/packaging/debian/syslog-ng-mod-smtp.install b/packaging/debian/axosyslog-mod-smtp.install similarity index 100% rename from packaging/debian/syslog-ng-mod-smtp.install rename to packaging/debian/axosyslog-mod-smtp.install diff --git a/packaging/debian/syslog-ng-mod-snmp.install b/packaging/debian/axosyslog-mod-snmp.install similarity index 100% rename from packaging/debian/syslog-ng-mod-snmp.install rename to packaging/debian/axosyslog-mod-snmp.install diff --git a/packaging/debian/syslog-ng-mod-sql.install b/packaging/debian/axosyslog-mod-sql.install similarity index 100% rename from packaging/debian/syslog-ng-mod-sql.install rename to packaging/debian/axosyslog-mod-sql.install diff --git a/packaging/debian/syslog-ng-mod-sql.postinst b/packaging/debian/axosyslog-mod-sql.postinst similarity index 100% rename from packaging/debian/syslog-ng-mod-sql.postinst rename to packaging/debian/axosyslog-mod-sql.postinst diff --git a/packaging/debian/syslog-ng-mod-sql.postrm b/packaging/debian/axosyslog-mod-sql.postrm similarity index 100% rename from packaging/debian/syslog-ng-mod-sql.postrm rename to packaging/debian/axosyslog-mod-sql.postrm diff --git a/packaging/debian/syslog-ng-mod-sql.preinst b/packaging/debian/axosyslog-mod-sql.preinst similarity index 100% rename from packaging/debian/syslog-ng-mod-sql.preinst rename to packaging/debian/axosyslog-mod-sql.preinst diff --git a/packaging/debian/syslog-ng-mod-stardate.install b/packaging/debian/axosyslog-mod-stardate.install similarity index 100% rename from packaging/debian/syslog-ng-mod-stardate.install rename to packaging/debian/axosyslog-mod-stardate.install diff --git a/packaging/debian/syslog-ng-mod-stomp.install b/packaging/debian/axosyslog-mod-stomp.install similarity index 100% rename from packaging/debian/syslog-ng-mod-stomp.install rename to packaging/debian/axosyslog-mod-stomp.install diff --git a/packaging/debian/syslog-ng-mod-xml-parser.install b/packaging/debian/axosyslog-mod-xml-parser.install similarity index 100% rename from packaging/debian/syslog-ng-mod-xml-parser.install rename to packaging/debian/axosyslog-mod-xml-parser.install diff --git a/packaging/debian/syslog-ng-scl.install b/packaging/debian/axosyslog-scl.install similarity index 100% rename from packaging/debian/syslog-ng-scl.install rename to packaging/debian/axosyslog-scl.install diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 70d06a6c1f..df128a9840 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,4 +1,4 @@ -syslog-ng (4.7.1-1) unstable; urgency=medium +axosyslog (4.7.1-1) unstable; urgency=medium * New upstream release 4.7.1 diff --git a/packaging/debian/control b/packaging/debian/control index d5512e91d9..09ccf06af7 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -1,4 +1,4 @@ -Source: syslog-ng +Source: axosyslog Section: admin Priority: optional Maintainer: syslog-ng maintainers @@ -49,17 +49,18 @@ Build-Depends: debhelper (>= 10~), libgrpc++-dev Build-Conflicts: autoconf2.13 Standards-Version: 4.4.1 -Homepage: https://www.syslog-ng.com/ +Homepage: https://axoflow.com/docs/axosyslog-core/ Vcs-Git: https://github.com/gcsideal/syslog-ng-debian.git Vcs-Browser: https://github.com/gcsideal/syslog-ng-debian -Package: syslog-ng +Package: axosyslog Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, syslog-ng-core (>= ${source:Upstream-Version}), syslog-ng-scl (>= ${source:Upstream-Version}), ${sng:CoreModules} +Depends: ${misc:Depends}, axosyslog-core (>= ${source:Upstream-Version}), axosyslog-scl (>= ${source:Upstream-Version}), ${sng:CoreModules} +Conflicts: syslog-ng Recommends: ${sng:Modules} Description: Enhanced system logging daemon (metapackage) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -74,17 +75,18 @@ Description: Enhanced system logging daemon (metapackage) * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). . - This package is a metapackage, depending on the rest of syslog-ng, + This package is a metapackage, depending on the rest of AxoSyslog, including all available plugins. It can be safely removed, if only - parts of syslog-ng need to be installed. + parts of AxoSyslog need to be installed. -Package: syslog-ng-dbg +Package: axosyslog-dbg Architecture: any Multi-Arch: same Section: debug -Depends: syslog-ng-core (= ${binary:Version}), ${misc:Depends} +Depends: axosyslog-core (= ${binary:Version}), ${misc:Depends} +Conflicts: syslog-ng-dbg Description: Enhanced system logging daemon (debug symbols) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -99,18 +101,19 @@ Description: Enhanced system logging daemon (debug symbols) * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). . - This package contains debug symbols for the whole of syslog-ng, + This package contains debug symbols for the whole of AxoSyslog, including the modules. -Package: syslog-ng-dev +Package: axosyslog-dev Section: libdevel Architecture: any -Depends: syslog-ng-core (= ${binary:Version}), +Depends: axosyslog-core (= ${binary:Version}), ${misc:Depends}, ${perl:Depends}, pkg-config, perl, flex, bison, python3, libglib2.0-dev, libivykis-dev (>= 0.30) +Conflicts: syslog-ng-dev Description: Enhanced system logging daemon (development files) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -126,20 +129,20 @@ Description: Enhanced system logging daemon (development files) AMQP), files or databases (like PostgreSQL or MongoDB). . This package contains the headers and tools needed to build - third-party plugins against syslog-ng, the next generation system + third-party plugins against AxoSyslog, the next generation system logging daemon. -Package: syslog-ng-core +Package: axosyslog-core Architecture: any Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.12-10), lsb-base (>= 3.0-6) Suggests: ${sng:CoreModules}, ${sng:Modules}, logrotate -Provides: system-log-daemon, linux-kernel-log-daemon, libsyslog-ng-dev, syslog-ng-mod-journal, syslog-ng-mod-pacctformat, syslog-ng-mod-tag-parser, syslog-ng-mod-extra -Conflicts: system-log-daemon, linux-kernel-log-daemon -Replaces: syslog-ng (<< 3.3.0~), libsyslog-ng-dev, syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~), syslog-ng-mod-extra (<< 3.26.1-2~) -Breaks: syslog-ng (<< 3.3.0~), libsyslog-ng-dev, syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~), syslog-ng-mod-extra (<< 3.26.1-2~) +Provides: system-log-daemon, linux-kernel-log-daemon +Conflicts: system-log-daemon, linux-kernel-log-daemon, syslog-ng-core +Replaces: syslog-ng (<< 3.3.0~), syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~), syslog-ng-mod-extra (<< 3.26.1-2~) +Breaks: syslog-ng (<< 3.3.0~), syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~), syslog-ng-mod-extra (<< 3.26.1-2~) Description: Enhanced system logging daemon (core) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -154,16 +157,17 @@ Description: Enhanced system logging daemon (core) * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). . - This package provides the core syslog-ng, with all the plugins + This package provides the core AxoSyslog, with all the plugins required for a standard installation. -Package: syslog-ng-mod-mongodb +Package: axosyslog-mod-mongodb Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-mongodb Suggests: mongodb-server Description: Enhanced system logging daemon (MongoDB plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -181,13 +185,14 @@ Description: Enhanced system logging daemon (MongoDB plugin) This package provides the MongoDB destination plugin, which allows one to log system messages to MongoDB. -Package: syslog-ng-mod-sql +Package: axosyslog-mod-sql Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-sql Suggests: libdbd-mysql, libdbd-pgsql, libdbd-sqlite3 Description: Enhanced system logging daemon (SQL plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -206,12 +211,13 @@ Description: Enhanced system logging daemon (SQL plugin) log system messages to a multitude of SQL databases (including, but not limited to MySQL, PostgreSQL and SQLite). -Package: syslog-ng-mod-smtp +Package: axosyslog-mod-smtp Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-smtp Description: Enhanced system logging daemon (SMTP plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -227,15 +233,16 @@ Description: Enhanced system logging daemon (SMTP plugin) AMQP), files or databases (like PostgreSQL or MongoDB). . This package provides the SMTP destination plugin, which allows one - to send email messages from within syslog-ng itself. + to send email messages from within AxoSyslog itself. -Package: syslog-ng-mod-amqp +Package: axosyslog-mod-amqp Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-amqp Suggests: rabbitmq-server Description: Enhanced system logging daemon (AMQP plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -253,15 +260,15 @@ Description: Enhanced system logging daemon (AMQP plugin) This package provides the AMQP destination plugin, which allows one to publish log messages through the AMQP protocol. -Package: syslog-ng-mod-geoip2 +Package: axosyslog-mod-geoip2 Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) -Provides: syslog-ng-mod-geoip +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-geoip2 Replaces: syslog-ng-mod-geoip (<< 3.25.1~) Breaks: syslog-ng-mod-geoip (<< 3.25.1~) Description: Enhanced system logging daemon (GeoIP2 plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -277,15 +284,16 @@ Description: Enhanced system logging daemon (GeoIP2 plugin) AMQP), files or databases (like PostgreSQL or MongoDB). . This package provides the GeoIP2 template function plugin, which - allows one to do non-DNS IP-to-country resolving from syslog-ng + allows one to do non-DNS IP-to-country resolving from AxoSyslog templates. GeoIP2 uses MaxMind DB. -Package: syslog-ng-mod-redis +Package: axosyslog-mod-redis Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-redis Description: Enhanced system logging daemon (Redis plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -301,15 +309,16 @@ Description: Enhanced system logging daemon (Redis plugin) AMQP), files or databases (like PostgreSQL or MongoDB). . This package provides the Redis destination plugin, which allows one - to issue Redis commands from within syslog-ng. + to issue Redis commands from within AxoSyslog. -Package: syslog-ng-mod-stomp +Package: axosyslog-mod-stomp Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-stomp Suggests: activemq Description: Enhanced system logging daemon (STOMP plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -327,12 +336,13 @@ Description: Enhanced system logging daemon (STOMP plugin) This package provides the STOMP destination plugin, which allows one to publish log messages through the STOMP protocol. -Package: syslog-ng-mod-riemann +Package: axosyslog-mod-riemann Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-riemann Description: Enhanced system logging daemon (Riemann destination) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -348,15 +358,16 @@ Description: Enhanced system logging daemon (Riemann destination) AMQP), files or databases (like PostgreSQL or MongoDB). . This package provides the Riemann destination, allowing one to push - events to a Riemann server from within syslog-ng. + events to a Riemann server from within AxoSyslog. -Package: syslog-ng-mod-graphite +Package: axosyslog-mod-graphite Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-graphite Suggests: graphite-web Description: Enhanced system logging daemon (graphite plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -373,15 +384,16 @@ Description: Enhanced system logging daemon (graphite plugin) . This package provides the graphite plugin, that adds a new template function, $(graphite-output), which makes it possible to easily send - metrics to Graphite from within syslog-ng. + metrics to Graphite from within AxoSyslog. -Package: syslog-ng-mod-python +Package: axosyslog-mod-python Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-venv, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-venv, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-python XB-Python-Version: ${python:Versions} Description: Enhanced system logging daemon (Python plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -397,14 +409,15 @@ Description: Enhanced system logging daemon (Python plugin) AMQP), files or databases (like PostgreSQL or MongoDB). . This package provides the Python plugin, that allows one to write - syslog-ng plugins in Python. + AxoSyslog plugins in Python. -Package: syslog-ng-mod-add-contextual-data +Package: axosyslog-mod-add-contextual-data Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-add-contextual-data Description: Enhanced system logging daemon (add-contextual-data plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -419,21 +432,21 @@ Description: Enhanced system logging daemon (add-contextual-data plugin) * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). . - This package provides the add-contextual-data module for syslog-ng. - With this module syslog-ng can use an external database file to + This package provides the add-contextual-data module for AxoSyslog. + With this module AxoSyslog can use an external database file to append custom name-value pairs on incoming logs (to enrich messages). The database is a file that containing `` records. Currently only `CSV` format is supported. It is like `geoip parser` where the selector is `$HOST`, but the user can define the selector, and also the database contents. -Package: syslog-ng-mod-getent +Package: axosyslog-mod-getent Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) -Conflicts: syslog-ng-mod-basicfuncs-plus ( << 0.6.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-basicfuncs-plus ( << 0.6.0), syslog-ng-mod-getent Description: Enhanced system logging daemon (getent plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -452,12 +465,13 @@ Description: Enhanced system logging daemon (getent plugin) Switch library to convert UIDs to names, protocol names to port number and much more. -Package: syslog-ng-mod-stardate +Package: axosyslog-mod-stardate Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-stardate Description: Enhanced system logging daemon (stardate plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -476,12 +490,13 @@ Description: Enhanced system logging daemon (stardate plugin) the date with months and days as fragments of the year. For example, it formats 2017.06.15 as something like 2017.500. -Package: syslog-ng-mod-map-value-pairs +Package: axosyslog-mod-map-value-pairs Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-value-pairs Description: Enhanced system logging daemon (map-value-pairs plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -499,12 +514,13 @@ Description: Enhanced system logging daemon (map-value-pairs plugin) With this package, it is possible to copy key-value pairs and do some other conversion and alteration in key-value pairs. -Package: syslog-ng-mod-snmp +Package: axosyslog-mod-snmp Architecture: linux-any hurd-i386 Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-snmp Description: Enhanced system logging daemon (SNMP plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -522,12 +538,13 @@ Description: Enhanced system logging daemon (SNMP plugin) This package provides the SNMP source/destination plugins, which allows one to send/receive SNMP traps. -Package: syslog-ng-mod-xml-parser +Package: axosyslog-mod-xml-parser Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-xml-parser Description: Enhanced system logging daemon (xml parser plugin) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -545,14 +562,15 @@ Description: Enhanced system logging daemon (xml parser plugin) The xml parser can process input in xml format, and adds the parsed data to the message object. -Package: syslog-ng-mod-http +Package: axosyslog-mod-http Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-http Replaces: syslog-ng-core (<< 3.26.1~) Breaks: syslog-ng-core (<< 3.26.1~) Description: Enhanced system logging daemon (HTTP destination) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -570,12 +588,13 @@ Description: Enhanced system logging daemon (HTTP destination) This package provides an HTTP destination, allowing one to send syslog messages as HTTP PUT messages to an http server. -Package: syslog-ng-mod-rdkafka +Package: axosyslog-mod-rdkafka Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-rdkafka Description: Enhanced system logging daemon (Kafka destination, based on librdkafka) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -593,14 +612,15 @@ Description: Enhanced system logging daemon (Kafka destination, based on librdka This package provides a native Kafka destination, written entirely in the C programming language, based on the librdkafka client library. -Package: syslog-ng-scl +Package: axosyslog-scl Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-scl Replaces: syslog-ng-mod-extra (<< 3.38.1~), syslog-ng-core (<< 3.38.1~), syslog-ng-mod-graphite (<< 3.38.1~), syslog-ng-mod-rdkafka (<< 3.38.1~), syslog-ng-mod-snmp (<< 3.38.1~) Breaks: syslog-ng-mod-extra (<< 3.38.1~), syslog-ng-core (<< 3.38.1~), syslog-ng-mod-graphite (<< 3.38.1~), syslog-ng-mod-rdkafka (<< 3.38.1~), syslog-ng-mod-snmp (<< 3.38.1~) Description: Enhanced system logging daemon (scl files) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -618,12 +638,13 @@ Description: Enhanced system logging daemon (scl files) This package collects scl files, scripts and config sniplets focusing on specific areas, providing help creating more readable configurations. -Package: syslog-ng-mod-examples +Package: axosyslog-mod-examples Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-examples Description: Enhanced system logging daemon (example plugins) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -640,12 +661,13 @@ Description: Enhanced system logging daemon (example plugins) . This package provides a collection of example plugins. -Package: syslog-ng-mod-slog +Package: axosyslog-mod-slog Architecture: any Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: syslog-ng-mod-slog Description: Enhanced system logging daemon (slog) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -663,13 +685,14 @@ Description: Enhanced system logging daemon (slog) This package provides the $(slog) template functions and command line utilities (slogencrypt, slogverify, slogkey). -Package: syslog-ng-mod-java +Package: axosyslog-mod-java Architecture: any Multi-Arch: foreign -Depends: syslog-ng-core (= ${binary:Version}), default-jre-headless -Recommends: syslog-ng-mod-java-common-lib +Depends: axosyslog-core (= ${binary:Version}), default-jre-headless +Conflicts: syslog-ng-mod-java +Recommends: axosyslog-mod-java-common-lib Description: Enhanced system logging daemon (Java destination) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -687,12 +710,13 @@ Description: Enhanced system logging daemon (Java destination) This package provides the Java destination, allowing one to write destination drivers without having to touch C, in Java. -Package: syslog-ng-mod-java-common-lib +Package: axosyslog-mod-java-common-lib Architecture: any Multi-Arch: foreign -Depends: syslog-ng-core (= ${binary:Version}), syslog-ng-mod-java +Depends: axosyslog-core (= ${binary:Version}), axosyslog-mod-java +Conflicts: syslog-ng-mod-java-common-lib Description: Enhanced system logging daemon (Java module common library) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -710,12 +734,13 @@ Description: Enhanced system logging daemon (Java module common library) This package provides common libraries for simplifying the creation of Java destinations. -Package: syslog-ng-mod-elastic +Package: axosyslog-mod-elastic Architecture: any Multi-Arch: foreign -Depends: syslog-ng-core (= ${binary:Version}), syslog-ng-mod-java-common-lib, syslog-ng-mod-java +Depends: axosyslog-core (= ${binary:Version}), axosyslog-mod-java-common-lib, axosyslog-mod-java +Conflicts: syslog-ng-mod-elastic Description: Enhanced system logging daemon (Elasticsearch destination) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -733,12 +758,13 @@ Description: Enhanced system logging daemon (Elasticsearch destination) This package provides the Elasticsearch destination, allowing one to send syslog messages to Elasticsearch. -Package: syslog-ng-mod-hdfs +Package: axosyslog-mod-hdfs Architecture: any Multi-Arch: foreign -Depends: syslog-ng-core (= ${binary:Version}), syslog-ng-mod-java-common-lib, syslog-ng-mod-java +Depends: axosyslog-core (= ${binary:Version}), axosyslog-mod-java-common-lib, axosyslog-mod-java +Conflicts: syslog-ng-mod-hdfs Description: Enhanced system logging daemon (HDFS destination) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -756,12 +782,13 @@ Description: Enhanced system logging daemon (HDFS destination) This package provides the HDFS destination, allowing one to send messages to HDFS. -Package: syslog-ng-mod-kafka +Package: axosyslog-mod-kafka Architecture: any Multi-Arch: foreign -Depends: syslog-ng-core (= ${binary:Version}), syslog-ng-mod-java-common-lib, syslog-ng-mod-java +Depends: axosyslog-core (= ${binary:Version}), axosyslog-mod-java-common-lib, axosyslog-mod-java +Conflicts: syslog-ng-mod-kafka Description: Enhanced system logging daemon (Kafka destination) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -779,12 +806,13 @@ Description: Enhanced system logging daemon (Kafka destination) This package provides the Apache Kafka destination, allowing one to send messages to Kafka. -Package: syslog-ng-mod-java-http +Package: axosyslog-mod-java-http Architecture: any Multi-Arch: foreign -Depends: syslog-ng-core (= ${binary:Version}), syslog-ng-mod-java-common-lib, syslog-ng-mod-java +Depends: axosyslog-core (= ${binary:Version}), axosyslog-mod-java-common-lib, axosyslog-mod-java +Conflicts: syslog-ng-mod-java-http Description: Enhanced system logging daemon (HTTP destination implemented in Java) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -802,12 +830,13 @@ Description: Enhanced system logging daemon (HTTP destination implemented in Jav This package provides an HTTP destination, allowing one to send syslog messages as HTTP PUT messages to an http server. -Package: syslog-ng-mod-mqtt +Package: axosyslog-mod-mqtt Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-mqtt Description: Enhanced system logging daemon (MQTT plugins) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -825,12 +854,13 @@ Description: Enhanced system logging daemon (MQTT plugins) This package provides the MQTT plugin, that allows receiving and sending MQTT messages. -Package: syslog-ng-mod-grpc +Package: axosyslog-mod-grpc Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-grpc Description: Enhanced system logging daemon (GRPC plugins) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . @@ -849,12 +879,13 @@ Description: Enhanced system logging daemon (GRPC plugins) . * OpenTelemetry logs, traces and metrics -Package: syslog-ng-mod-cloud-auth +Package: axosyslog-mod-cloud-auth Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~) +Conflicts: syslog-ng-mod-cloud-auth Description: Enhanced system logging daemon (Cloud Auth plugins) - syslog-ng is an enhanced log daemon, supporting a wide range of input + AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. . diff --git a/packaging/debian/copyright b/packaging/debian/copyright index 35cf935287..cce0398464 100644 --- a/packaging/debian/copyright +++ b/packaging/debian/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: syslog-ng +Upstream-Name: axosyslog Upstream-Contact: Syslog-ng users' and developers' mailing list -Source: git://github.com/syslog-ng/syslog-ng.git +Source: git://github.com/axoflow/axosyslog.git Copyright: Copyright (C) Balázs Scheidler Copyright (C) BalaBit IT Security Ltd. diff --git a/packaging/debian/gbp.conf b/packaging/debian/gbp.conf index 29285fbced..11bc13465e 100644 --- a/packaging/debian/gbp.conf +++ b/packaging/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] debian-branch = debian/unstable -debian-tag = debian/syslog-ng-%(version)s +debian-tag = debian/axosyslog-%(version)s upstream-branch = upstream/3.x overlay = True diff --git a/packaging/debian/rules b/packaging/debian/rules index 489d4dab61..3df1bb9ef9 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -33,13 +33,13 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) EXTRA_CONFIGURE_OPTS += --enable-debug endif -# We want to support building from a git tree, where the syslog-ng -# sources are in a submodule, in syslog-ng-*. Since we do not wish to +# We want to support building from a git tree, where the axosyslog +# sources are in a submodule, in axosyslog-*. Since we do not wish to # update the rules for every major version if it can be helped, figure # it out from the changelog instead. UMAJOR = $(shell dpkg-parsechangelog | sed -n '/^Version:/s/^Version: //p' | cut -d. -f1,2) -export DH_OPTIONS += -O-Bdebian/build-tree --dbg-package=syslog-ng-dbg +export DH_OPTIONS += -O-Bdebian/build-tree --dbg-package=axosyslog-dbg CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS) @@ -57,7 +57,7 @@ PACCT_CONFIGURE_OPTS = --disable-pacct endif ifneq ($(filter nojava,$(DEB_BUILD_PROFILES)),) -DH_OPTIONS += -Nsyslog-ng-mod-java -Nsyslog-ng-mod-kafka -Nsyslog-ng-mod-java-common-lib -Nsyslog-ng-mod-elastic -Nsyslog-ng-mod-java-http -Nsyslog-ng-mod-hdfs +DH_OPTIONS += -Naxosyslog-mod-java -Naxosyslog-mod-kafka -Naxosyslog-mod-java-common-lib -Naxosyslog-mod-elastic -Naxosyslog-mod-java-http -Naxosyslog-mod-hdfs else export GRADLE_USER_HOME = /tmp/gradle endif @@ -65,15 +65,15 @@ endif PYTHON_VERSION = 3 ifneq ($(filter sng-nokafka,$(DEB_BUILD_PROFILES)),) -DH_OPTIONS += -Nsyslog-ng-mod-rdkafka +DH_OPTIONS += -Naxosyslog-mod-rdkafka endif ifneq ($(filter sng-nomqtt,$(DEB_BUILD_PROFILES)),) -DH_OPTIONS += -Nsyslog-ng-mod-mqtt +DH_OPTIONS += -Naxosyslog-mod-mqtt endif ifneq ($(filter sng-nogrpc,$(DEB_BUILD_PROFILES)),) -DH_OPTIONS += -Nsyslog-ng-mod-grpc +DH_OPTIONS += -Naxosyslog-mod-grpc endif # If DH_QUIET is set, then we want silent mode. @@ -175,36 +175,36 @@ override_dh_auto_test: override_dh_installchangelogs: dh_installchangelogs NEWS.md -# Init files and whatnot were moved to syslog-ng-core, but we want to +# Init files and whatnot were moved to axosyslog-core, but we want to # retain the old filenames. override_dh_installinit: - dh_installinit --name syslog-ng --restart-after-upgrade + dh_installinit --name axosyslog --restart-after-upgrade -# Logrotate and Logcheck files were moved from syslog-ng to -# syslog-ng-core too, and like in init's case, we want to keep the old +# Logrotate and Logcheck files were moved from axosyslog to +# axosyslog-core too, and like in init's case, we want to keep the old # name. override_dh_installlogrotate: - dh_installlogrotate --name syslog-ng + dh_installlogrotate --name axosyslog override_dh_installlogcheck: - dh_installlogcheck --name syslog-ng + dh_installlogcheck --name axosyslog # dh_makeshlibs wants to be clever and treat plugins as shared libs. # Slap it in the face, and tell it not to. We also do not need any # script modifications, as our single shared lib is in a private # directory. On the other hand, we do want correct dependencies on -# anything that build-depends on syslog-ng-dev, so lets make a correct +# anything that build-depends on axosyslog-dev, so lets make a correct # shlibs file for that, shall we? # override_dh_makeshlibs: dh_makeshlibs -n -Xusr/lib/syslog-ng/${UMAJOR} -# Since syslog-ng depends on all the modules, and syslog-ng-core +# Since axosyslog depends on all the modules, and axosyslog-core # suggests the same set, and modules can come and go as new versions -# of syslog-ng come out, lets make our life easy, and provide a custom +# of axosyslog come out, lets make our life easy, and provide a custom # sng:Modules substvar, which has all the module packages listed. We # also provide sng:CoreModules, which lists core modules that were -# part of syslog-ng (or it depended on them) previously, in 3.3. +# part of axosyslog (or it depended on them) previously, in 3.3. override_dh_gencontrol: dh_gencontrol -- -Vsng:Modules=$(shell debian/tools/list-modules.sh optional) \ -Vsng:CoreModules=$(shell debian/tools/list-modules.sh core) @@ -221,7 +221,7 @@ override_dh_python3: override_dh_missing: dh_missing --fail-missing -# By default, the arch:all syslog-ng package does not need anything +# By default, the arch:all axosyslog package does not need anything # built, so build-indep shall be empty. This avoids triggering another # build attempt, which would fail due to autoreconf being run # twice. It would also fail if no build-deps were installed (since the diff --git a/packaging/debian/tests/control b/packaging/debian/tests/control index 6a88dd6d7e..cc0563ae31 100644 --- a/packaging/debian/tests/control +++ b/packaging/debian/tests/control @@ -1,9 +1,9 @@ Tests: basic -Depends: syslog-ng-core +Depends: axosyslog-core Restrictions: allow-stderr Tests: basic -Depends: syslog-ng +Depends: axosyslog Restrictions: allow-stderr Tests: basic @@ -11,79 +11,79 @@ Depends: @ Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core +Depends: axosyslog-core Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-mongodb +Depends: axosyslog-core, axosyslog-mod-mongodb Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-sql +Depends: axosyslog-core, axosyslog-mod-sql Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-smtp +Depends: axosyslog-core, axosyslog-mod-smtp Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-amqp +Depends: axosyslog-core, axosyslog-mod-amqp Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-geoip2 +Depends: axosyslog-core, axosyslog-mod-geoip2 Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-redis +Depends: axosyslog-core, axosyslog-mod-redis Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-stomp +Depends: axosyslog-core, axosyslog-mod-stomp Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-riemann +Depends: axosyslog-core, axosyslog-mod-riemann Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-graphite +Depends: axosyslog-core, axosyslog-mod-graphite Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-python +Depends: axosyslog-core, axosyslog-mod-python Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-add-contextual-data +Depends: axosyslog-core, axosyslog-mod-add-contextual-data Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-getent +Depends: axosyslog-core, axosyslog-mod-getent Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-stardate +Depends: axosyslog-core, axosyslog-mod-stardate Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-map-value-pairs +Depends: axosyslog-core, axosyslog-mod-map-value-pairs Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-snmptrapd-parser +Depends: axosyslog-core, axosyslog-mod-snmptrapd-parser Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-xml-parser +Depends: axosyslog-core, axosyslog-mod-xml-parser Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-extra +Depends: axosyslog-core, axosyslog-mod-extra Restrictions: allow-stderr Tests: basic -Depends: syslog-ng-core, syslog-ng-mod-tag-parser +Depends: axosyslog-core, axosyslog-mod-tag-parser Restrictions: allow-stderr #Tests: upgrade @@ -98,4 +98,4 @@ Depends: @, sysvinit-core Restrictions: needs-root, allow-stderr #Tests: compile-incubator -#Depends: build-essential, syslog-ng-dev, fakeroot, debhelper, dh-autoreconf, automake, liblua5.2-dev, libperl-dev, python-dev, libgrok-dev, libtokyocabinet-dev, librdkafka-dev, libzmq3-dev, libmongo-client-dev +#Depends: build-essential, axosyslog-dev, fakeroot, debhelper, dh-autoreconf, automake, liblua5.2-dev, libperl-dev, python-dev, libgrok-dev, libtokyocabinet-dev, librdkafka-dev, libzmq3-dev, libmongo-client-dev diff --git a/packaging/debian/tests/upgrade b/packaging/debian/tests/upgrade index b114dab7cc..62c1ba23ff 100644 --- a/packaging/debian/tests/upgrade +++ b/packaging/debian/tests/upgrade @@ -1,21 +1,21 @@ #!/bin/sh -e -orig_version=$(apt-cache policy syslog-ng | grep "500$" | awk '{print $1}') +orig_version=$(apt-cache policy axosyslog | grep "500$" | awk '{print $1}') apt_line="" -for pkg in syslog-ng \ - syslog-ng-core \ - syslog-ng-mod-mongodb \ - syslog-ng-mod-sql \ - syslog-ng-mod-smtp \ - syslog-ng-mod-amqp \ - syslog-ng-mod-geoip2 \ - syslog-ng-mod-redis \ - syslog-ng-mod-stomp \ - syslog-ng-mod-riemann \ - syslog-ng-mod-graphite \ - syslog-ng-mod-python \ - syslog-ng-mod-add-contextual-data +for pkg in axosyslog \ + axosyslog-core \ + axosyslog-mod-mongodb \ + axosyslog-mod-sql \ + axosyslog-mod-smtp \ + axosyslog-mod-amqp \ + axosyslog-mod-geoip2 \ + axosyslog-mod-redis \ + axosyslog-mod-stomp \ + axosyslog-mod-riemann \ + axosyslog-mod-graphite \ + axosyslog-mod-python \ + axosyslog-mod-add-contextual-data do apt_line="$apt_line $pkg=$orig_version" done diff --git a/packaging/debian/tools/list-modules.sh b/packaging/debian/tools/list-modules.sh index 456eb0ad79..eb23921c7d 100755 --- a/packaging/debian/tools/list-modules.sh +++ b/packaging/debian/tools/list-modules.sh @@ -1,7 +1,7 @@ #! /bin/sh -CORE_MODULES="syslog-ng-mod-sql syslog-ng-mod-mongodb" -ALL_MODULES=$(echo $(grep "^Package: syslog-ng-mod-" debian/control | cut -d: -f 2)) +CORE_MODULES="axosyslog-mod-sql axosyslog-mod-mongodb" +ALL_MODULES=$(echo $(grep "^Package: axosyslog-mod-" debian/control | cut -d: -f 2)) case "$1" in "core") diff --git a/packaging/debian/watch b/packaging/debian/watch index 2348c6bce3..43a48a6e69 100644 --- a/packaging/debian/watch +++ b/packaging/debian/watch @@ -1,3 +1,3 @@ version=3 -https://github.com/syslog-ng/syslog-ng/tags .*/syslog-ng-([\d\.]+)\.tar\.gz +https://github.com/axoflow/axosyslog/tags .*/axosyslog-([\d\.]+)\.tar\.gz diff --git a/packaging/rhel/syslog-ng.spec b/packaging/rhel/axosyslog.spec similarity index 91% rename from packaging/rhel/syslog-ng.spec rename to packaging/rhel/axosyslog.spec index 18310654ab..55044ddcad 100644 --- a/packaging/rhel/syslog-ng.spec +++ b/packaging/rhel/axosyslog.spec @@ -1,12 +1,12 @@ -Name: syslog-ng +Name: axosyslog Version: 4.7.1 Release: 2%{?dist} Summary: Next-generation syslog server Group: System Environment/Daemons License: GPLv2+ -URL: http://www.balabit.com/network-security/syslog-ng -Source0: https://github.com/syslog-ng/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz +URL: https://axoflow.com/docs/axosyslog-core/ +Source0: https://github.com/axoflow/axosyslog/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: syslog-ng.conf Source2: syslog-ng.logrotate Source3: syslog-ng.service @@ -129,16 +129,18 @@ Requires: logrotate Requires: ivykis >= %{ivykis_ver} Provides: syslog +Conflicts: syslog-ng +Conflicts: syslog-ng-premium-edition # Fedora 17’s unified filesystem (/usr-move) Conflicts: filesystem < 3 %if 0%{?rhel} != 7 -Recommends: syslog-ng-logrotate +Recommends: axosyslog-logrotate %endif %description -syslog-ng is an enhanced log daemon, supporting a wide range of input and +AxoSyslog is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. @@ -218,12 +220,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This module supports authentication to cloud providers. %package java -Summary: Java destination support for syslog-ng +Summary: Java destination support for axosyslog Group: System/Libraries Requires: %{name} = %{version} %description java -This package provides java destination support for syslog-ng. It +This package provides java destination support for axosyslog. It only contains the java bindings, no drivers. @@ -233,7 +235,7 @@ Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description geoip -This package provides GeoIP support for syslog-ng +This package provides GeoIP support for axosyslog %package redis @@ -269,12 +271,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This module adds support for the $(slog) template function plus command line utilities. %package python -Summary: Python destination support for syslog-ng +Summary: Python destination support for axosyslog Group: System/Libraries Requires: %{name} = %{version} %description python -This package provides python destination support for syslog-ng. +This package provides python destination support for axosyslog. %package devel Summary: Development files for %{name} @@ -292,7 +294,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Conflicts: rsyslog %description logrotate -This package provides a logrotate script for syslog-ng. It is only installed if +This package provides a logrotate script for axosyslog. It is only installed if ryslog is not on the system. %prep @@ -311,10 +313,10 @@ ryslog is not on the system. %configure \ --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir}/%{name} \ - --localstatedir=%{_sharedstatedir}/%{name} \ + --sysconfdir=%{_sysconfdir}/syslog-ng \ + --localstatedir=%{_sharedstatedir}/syslog-ng \ --datadir=%{_datadir} \ - --with-module-dir=%{_libdir}/%{name} \ + --with-module-dir=%{_libdir}/syslog-ng \ --with-systemdsystemunitdir=%{_unitdir} \ --with-ivykis=system \ %if 0%{?rhel} == 7 @@ -359,8 +361,8 @@ make %{_smp_mflags} %install make DESTDIR=%{buildroot} install -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/conf.d -%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf +%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/syslog-ng/conf.d +%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/syslog-ng/syslog-ng.conf %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d %if 0%{?rhel} == 7 @@ -374,19 +376,19 @@ make DESTDIR=%{buildroot} install %endif %if %{with systemd} -%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service +%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/syslog-ng.service # remove unused service file rm %{buildroot}/usr/lib/systemd/system/syslog-ng@.service %endif # create the local state dir -%{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/%{name} +%{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/syslog-ng # install the main library header files -%{__install} -d -m 755 %{buildroot}%{_includedir}/%{name} -%{__install} -p -m 644 config.h %{buildroot}%{_includedir}/%{name} -%{__install} -p -m 644 lib/*.h %{buildroot}%{_includedir}/%{name} +%{__install} -d -m 755 %{buildroot}%{_includedir}/syslog-ng +%{__install} -p -m 644 config.h %{buildroot}%{_includedir}/syslog-ng +%{__install} -p -m 644 lib/*.h %{buildroot}%{_includedir}/syslog-ng find %{buildroot} -name "*.la" -exec rm -f {} \; @@ -405,8 +407,8 @@ ldconfig %triggerun -- syslog-ng < 3.2.3 -if /sbin/chkconfig --level 3 %{name} ; then - /bin/systemctl enable %{name}.service >/dev/null 2>&1 || : +if /sbin/chkconfig --level 3 syslog-ng ; then + /bin/systemctl enable syslog-ng.service >/dev/null 2>&1 || : fi @@ -415,76 +417,76 @@ fi # %doc doc/security/*.txt %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc} -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/conf.d -%dir %{_sysconfdir}/%{name}/patterndb.d -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_datadir}/%{name}/include/scl.conf +%dir %{_sysconfdir}/syslog-ng +%dir %{_sysconfdir}/syslog-ng/conf.d +%dir %{_sysconfdir}/syslog-ng/patterndb.d +%config(noreplace) %{_sysconfdir}/syslog-ng/syslog-ng.conf +%config(noreplace) %{_datadir}/syslog-ng/include/scl.conf %if 0%{?rhel} == 7 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog %endif -%dir %{_sharedstatedir}/%{name} -%{_sbindir}/%{name} -%{_sbindir}/%{name}-debun +%dir %{_sharedstatedir}/syslog-ng +%{_sbindir}/syslog-ng +%{_sbindir}/syslog-ng-debun %{_sbindir}/syslog-ng-ctl %{_bindir}/loggen %{_bindir}/pdbtool %{_bindir}/dqtool %{_bindir}/update-patterndb %{_bindir}/persist-tool -%{_libdir}/lib%{name}-*.so.* +%{_libdir}/libsyslog-ng-*.so.* %{_libdir}/libevtlog-*.so.* %{_libdir}/libsecret-storage.so.* %{_libdir}/libloggen_helper-*.so.* %{_libdir}/libloggen_plugin-*.so.* -%{_libdir}/%{name}/libadd-contextual-data.so -%{_libdir}/%{name}/libaffile.so -%{_libdir}/%{name}/libafprog.so -%{_libdir}/%{name}/libafsocket.so -%{_libdir}/%{name}/libafstomp.so -%{_libdir}/%{name}/libafuser.so -%{_libdir}/%{name}/libappmodel.so -%{_libdir}/%{name}/libbasicfuncs.so -%{_libdir}/%{name}/libcef.so -%{_libdir}/%{name}/libconfgen.so -%{_libdir}/%{name}/libcryptofuncs.so -%{_libdir}/%{name}/libcsvparser.so -%{_libdir}/%{name}/libtimestamp.so -%{_libdir}/%{name}/libcorrelation.so -%{_libdir}/%{name}/libdisk-buffer.so -%{_libdir}/%{name}/libexamples.so -%{_libdir}/%{name}/libgraphite.so -%{_libdir}/%{name}/libhook-commands.so -%{_libdir}/%{name}/libjson-plugin.so -%{_libdir}/%{name}/libkvformat.so -%{_libdir}/%{name}/liblinux-kmsg-format.so -%{_libdir}/%{name}/libmap-value-pairs.so -%{_libdir}/%{name}/libpseudofile.so -%{_libdir}/%{name}/libregexp-parser.so -%{_libdir}/%{name}/librate-limit-filter.so -%{_libdir}/%{name}/libstardate.so -%{_libdir}/%{name}/libsyslogformat.so -%{_libdir}/%{name}/libsystem-source.so -%{_libdir}/%{name}/libtags-parser.so -%{_libdir}/%{name}/libtfgetent.so -%{_libdir}/%{name}/libxml.so -%{_libdir}/%{name}/libpacctformat.so -%{_libdir}/%{name}/libmetrics-probe.so +%{_libdir}/syslog-ng/libadd-contextual-data.so +%{_libdir}/syslog-ng/libaffile.so +%{_libdir}/syslog-ng/libafprog.so +%{_libdir}/syslog-ng/libafsocket.so +%{_libdir}/syslog-ng/libafstomp.so +%{_libdir}/syslog-ng/libafuser.so +%{_libdir}/syslog-ng/libappmodel.so +%{_libdir}/syslog-ng/libbasicfuncs.so +%{_libdir}/syslog-ng/libcef.so +%{_libdir}/syslog-ng/libconfgen.so +%{_libdir}/syslog-ng/libcryptofuncs.so +%{_libdir}/syslog-ng/libcsvparser.so +%{_libdir}/syslog-ng/libtimestamp.so +%{_libdir}/syslog-ng/libcorrelation.so +%{_libdir}/syslog-ng/libdisk-buffer.so +%{_libdir}/syslog-ng/libexamples.so +%{_libdir}/syslog-ng/libgraphite.so +%{_libdir}/syslog-ng/libhook-commands.so +%{_libdir}/syslog-ng/libjson-plugin.so +%{_libdir}/syslog-ng/libkvformat.so +%{_libdir}/syslog-ng/liblinux-kmsg-format.so +%{_libdir}/syslog-ng/libmap-value-pairs.so +%{_libdir}/syslog-ng/libpseudofile.so +%{_libdir}/syslog-ng/libregexp-parser.so +%{_libdir}/syslog-ng/librate-limit-filter.so +%{_libdir}/syslog-ng/libstardate.so +%{_libdir}/syslog-ng/libsyslogformat.so +%{_libdir}/syslog-ng/libsystem-source.so +%{_libdir}/syslog-ng/libtags-parser.so +%{_libdir}/syslog-ng/libtfgetent.so +%{_libdir}/syslog-ng/libxml.so +%{_libdir}/syslog-ng/libpacctformat.so +%{_libdir}/syslog-ng/libmetrics-probe.so %if %{with systemd} -%{_unitdir}/%{name}.service -%{_libdir}/%{name}/libsdjournal.so +%{_unitdir}/syslog-ng.service +%{_libdir}/syslog-ng/libsdjournal.so %endif -%dir %{_libdir}/%{name}/loggen -%{_libdir}/%{name}/loggen/libloggen* +%dir %{_libdir}/syslog-ng/loggen +%{_libdir}/syslog-ng/loggen/libloggen* # scl files -%{_datadir}/%{name}/include/ +%{_datadir}/syslog-ng/include/ # uhm, some better places for those? -%{_datadir}/%{name}/xsd/ -%{_datadir}/%{name}/smart-multi-line.fsm +%{_datadir}/syslog-ng/xsd/ +%{_datadir}/syslog-ng/smart-multi-line.fsm %{_mandir}/man1/loggen.1* %{_mandir}/man1/pdbtool.1* @@ -497,70 +499,70 @@ fi %if %{with sql} %files sql -%{_libdir}/%{name}/libafsql.so +%{_libdir}/syslog-ng/libafsql.so %endif %if %{with amqp} %files amqp -%{_libdir}/%{name}/libafamqp.so +%{_libdir}/syslog-ng/libafamqp.so %endif %if %{with mongodb} %files mongodb -%{_libdir}/%{name}/libafmongodb.so +%{_libdir}/syslog-ng/libafmongodb.so %endif %if %{with redis} %files redis -%{_libdir}/%{name}/libredis.so +%{_libdir}/syslog-ng/libredis.so %endif %if %{with kafka} %files kafka -%{_libdir}/%{name}/libkafka.so +%{_libdir}/syslog-ng/libkafka.so %endif %if %{with afsnmp} %files afsnmp -%{_libdir}/%{name}/libafsnmp.so +%{_libdir}/syslog-ng/libafsnmp.so %endif %if %{with mqtt} %files mqtt -%{_libdir}/%{name}/libmqtt.so +%{_libdir}/syslog-ng/libmqtt.so %endif %if %{with cloud_auth} %files cloud-auth -%{_libdir}/%{name}/libcloud_auth.so +%{_libdir}/syslog-ng/libcloud_auth.so %endif %files smtp -%{_libdir}/%{name}/libafsmtp.so +%{_libdir}/syslog-ng/libafsmtp.so %if %{with java} %files java %attr(755,root,root) %{_libdir}/syslog-ng/libmod-java.so -%dir %{_libdir}/%{name}/java-modules/ -%{_libdir}/%{name}/java-modules/* +%dir %{_libdir}/syslog-ng/java-modules/ +%{_libdir}/syslog-ng/java-modules/* %endif %if %{with maxminddb} %files geoip -%{_libdir}/%{name}/libgeoip2-plugin.so +%{_libdir}/syslog-ng/libgeoip2-plugin.so %endif %if %{with riemann} %files riemann -%{_libdir}/%{name}/libriemann.so +%{_libdir}/syslog-ng/libriemann.so %endif %files http -%{_libdir}/%{name}/libhttp.so -%{_libdir}/%{name}/libazure-auth-header.so +%{_libdir}/syslog-ng/libhttp.so +%{_libdir}/syslog-ng/libazure-auth-header.so %files slog -%{_libdir}/%{name}/libsecure-logging.so +%{_libdir}/syslog-ng/libsecure-logging.so %{_bindir}/slogkey %{_bindir}/slogencrypt %{_bindir}/slogverify @@ -570,12 +572,12 @@ fi %{_mandir}/man7/secure-logging.7* %files python -%{_libdir}/%{name}/python/syslogng-1.0-py%{py_ver}.egg-info -%{_libdir}/%{name}/python/syslogng/* -%{_libdir}/%{name}/python/requirements.txt -%{_libdir}/%{name}/libmod-python.so -%dir %{_sysconfdir}/%{name}/python -%{_sysconfdir}/%{name}/python/README.md +%{_libdir}/syslog-ng/python/syslogng-1.0-py%{py_ver}.egg-info +%{_libdir}/syslog-ng/python/syslogng/* +%{_libdir}/syslog-ng/python/requirements.txt +%{_libdir}/syslog-ng/libmod-python.so +%dir %{_sysconfdir}/syslog-ng/python +%{_sysconfdir}/syslog-ng/python/README.md %{_bindir}/syslog-ng-update-virtualenv %post python @@ -594,14 +596,14 @@ fi # without criterion we don't have the test lib. On dbld we do have it, on # upstream CentOS/Fedora we don't. -%{_libdir}/%{name}/libtest/libsyslog-ng-test.a +%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a %{_libdir}/pkgconfig/syslog-ng-test.pc %endif -%{_includedir}/%{name}/ +%{_includedir}/syslog-ng/ %{_libdir}/pkgconfig/syslog-ng.pc %{_libdir}/pkgconfig/syslog-ng-native-connector.pc -%{_datadir}/%{name}/tools/ +%{_datadir}/syslog-ng/tools/ %if 0%{?rhel} != 7 %files logrotate