From 5532de7f2d16c8854e4b7cfcd9a9105d3490eaf7 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:45:03 +0200 Subject: [PATCH 01/22] refactor: moderniue drone config --- .drone.env | 2 + .drone.yml | 136 ++++++++++++++++++++++++-------------------------- renovate.json | 4 ++ 3 files changed, 72 insertions(+), 70 deletions(-) create mode 100644 .drone.env create mode 100644 renovate.json diff --git a/.drone.env b/.drone.env new file mode 100644 index 0000000..92bd0e4 --- /dev/null +++ b/.drone.env @@ -0,0 +1,2 @@ +# renovate: datasource=github-releases depName=OpenPrinting/cups +export CUPS_VERSION="${CUPS_VERSION:-v2.3.3op1}" diff --git a/.drone.yml b/.drone.yml index 833905c..9628930 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,62 +7,54 @@ platform: arch: amd64 steps: -- name: build - image: thegeeklab/rpmbuild - commands: - - "[ -z \"$BUILD_VERSION\" ] && BUILD_VERSION=2.3.3" - - wget -q https://github.com/apple/cups/releases/download/v$BUILD_VERSION/cups-$BUILD_VERSION-source.tar.gz - - rpmbuild -ta --without libusb1 cups-$BUILD_VERSION-source.tar.gz - environment: - BUILD_VERSION: ${DRONE_TAG##v} + - name: build + image: thegeeklab/rpmbuild + commands: + - source .drone.env + - wget -q https://github.com/OpenPrinting/cups/releases/download/v$CUPS_VERSION/cups-v$CUPS_VERSION-source.tar.gz + - rpmbuild -ta --without libusb1 cups-${CUPS_VERSION##v}-source.tar.gz -- name: checksum - image: alpine - commands: - - apk add --no-cache coreutils - - sha256sum -b dist/RPMS/x86_64/* > dist/sha256sum.txt + - name: checksum + image: thegee + commands: + - cd /drone/src/dist/RPMS/x86_64/ && sha256sum * > /drone/src/dist/sha256sum.txt -- name: gpgsign - pull: always - image: plugins/gpgsign:1 - settings: - detach_sign: true - files: - - dist/RPMS/x86_64/* - key: - from_secret: gpgsign_key - passphrase: - from_secret: gpgsign_passphrase + - name: changelog-generate + image: thegeeklab/git-chglog + commands: + - git fetch -tq + - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased} + depends_on: + - tags -- name: release - image: plugins/gitea-release - settings: - api_key: - from_secret: gitea_token - base_url: https://gitea.rknet.org - files: - - dist/RPMS/x86_64/* - - dist/sha256sum.txt - title: ${DRONE_TAG} - when: - ref: - - refs/tags/** + - name: changelog-format + image: thegeeklab/alpine-tools + commands: + - prettier CHANGELOG.md + - prettier -w CHANGELOG.md + depends_on: + - changelog-generate + + - name: publish-gitea + image: plugins/gitea-release + settings: + api_key: + from_secret: gitea_token + base_url: https://gitea.rknet.org + files: + - /drone/src/dist/RPMS/x86_64/* + - /drone/src/dist/sha256sum.txt + note: CHANGELOG.md + overwrite: true + title: ${DRONE_TAG} + when: + ref: + - refs/tags/** -- name: repository - image: plugins/s3 - settings: - access_key: - from_secret: s3_access_key - bucket: packages - endpoint: https://sp.rknet.org - path_style: true - secret_key: - from_secret: s3_secret_access_key - source: dist/RPMS/x86_64/*.rpm - strip_prefix: dist/RPMS/ - target: /centos/7/ - when: - ref: +trigger: + ref: + - refs/heads/main + - refs/pull/** - refs/tags/** --- @@ -74,32 +66,36 @@ platform: arch: amd64 steps: -- name: matrix - image: plugins/matrix - settings: - homeserver: - from_secret: matrix_homeserver - password: - from_secret: matrix_password - roomid: - from_secret: matrix_roomid - template: "Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}" - username: - from_secret: matrix_username + - name: matrix + image: thegeeklab/drone-matrix + settings: + homeserver: + from_secret: matrix_homeserver + password: + from_secret: matrix_password + roomid: + from_secret: matrix_roomid + template: "Status: **{{ build.Status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}" + username: + from_secret: matrix_username + when: + status: + - success + - failure trigger: ref: - - refs/heads/master - - refs/tags/** + - refs/heads/master + - refs/tags/** status: - - success - - failure + - success + - failure depends_on: -- build + - build --- kind: signature -hmac: a48861856f45a5fea19c866058aa857abcdd77d604be1835d254407e7d7d0688 +hmac: ef12dc4cc2bd5bdd48ad22c1671fbc838e4e3e40163b3a3a3b8c893d19ea7e19 ... diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..5f02575 --- /dev/null +++ b/renovate.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["github>thegeeklab/renovate-presets:docker"] +} -- 2.24.4 From a2c74861d86f7d14f287a17183c9f26b8187b5fe Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:45:56 +0200 Subject: [PATCH 02/22] remove unused deps --- .drone.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9628930..eca7c2e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,16 +24,12 @@ steps: commands: - git fetch -tq - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased} - depends_on: - - tags - name: changelog-format image: thegeeklab/alpine-tools commands: - prettier CHANGELOG.md - prettier -w CHANGELOG.md - depends_on: - - changelog-generate - name: publish-gitea image: plugins/gitea-release @@ -96,6 +92,6 @@ depends_on: --- kind: signature -hmac: ef12dc4cc2bd5bdd48ad22c1671fbc838e4e3e40163b3a3a3b8c893d19ea7e19 +hmac: d02216518e73eccca0f72dc7b5dd8553b6fc44d8bb43513bc38ed49cb458bb3d ... -- 2.24.4 From 1d388dac67de364e2d6bbb5a83ff8c2075c2a132 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:47:31 +0200 Subject: [PATCH 03/22] switch to new rpmbuild image --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index eca7c2e..57a296c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: build - image: thegeeklab/rpmbuild + image: thegeeklab/rpmbuild:7 commands: - source .drone.env - wget -q https://github.com/OpenPrinting/cups/releases/download/v$CUPS_VERSION/cups-v$CUPS_VERSION-source.tar.gz @@ -92,6 +92,6 @@ depends_on: --- kind: signature -hmac: d02216518e73eccca0f72dc7b5dd8553b6fc44d8bb43513bc38ed49cb458bb3d +hmac: ee191812b250c27c0ae8bcf96ad7e2d2c9d62f93f4786cd2a9d97b437d6575cc ... -- 2.24.4 From c5fbc75bcf3db94e150c393aacf071b0b071ddd4 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:49:28 +0200 Subject: [PATCH 04/22] debug --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 57a296c..7d9c537 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,6 +10,8 @@ steps: - name: build image: thegeeklab/rpmbuild:7 commands: + - pwd + - ls -la - source .drone.env - wget -q https://github.com/OpenPrinting/cups/releases/download/v$CUPS_VERSION/cups-v$CUPS_VERSION-source.tar.gz - rpmbuild -ta --without libusb1 cups-${CUPS_VERSION##v}-source.tar.gz @@ -92,6 +94,6 @@ depends_on: --- kind: signature -hmac: ee191812b250c27c0ae8bcf96ad7e2d2c9d62f93f4786cd2a9d97b437d6575cc +hmac: 4b4df798048280d05cded5afe47b708f110f9ef272da4f2f22041e31a79c43f0 ... -- 2.24.4 From 85d65e3b0ded6d90fdf3b49bee25e429112e36ed Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:50:26 +0200 Subject: [PATCH 05/22] debug --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7d9c537..08fd60b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: commands: - pwd - ls -la - - source .drone.env + - source /drone/src/.drone.env - wget -q https://github.com/OpenPrinting/cups/releases/download/v$CUPS_VERSION/cups-v$CUPS_VERSION-source.tar.gz - rpmbuild -ta --without libusb1 cups-${CUPS_VERSION##v}-source.tar.gz @@ -94,6 +94,6 @@ depends_on: --- kind: signature -hmac: 4b4df798048280d05cded5afe47b708f110f9ef272da4f2f22041e31a79c43f0 +hmac: 6a222591b75dd1b22d278467cb82fcac5fbba807607ce61f3335a160a0644515 ... -- 2.24.4 From 7e7aacb963a218af14fcde36ca139cbef2a1a9e7 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:51:18 +0200 Subject: [PATCH 06/22] fix download url --- .drone.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 08fd60b..316f0d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,10 +10,8 @@ steps: - name: build image: thegeeklab/rpmbuild:7 commands: - - pwd - - ls -la - source /drone/src/.drone.env - - wget -q https://github.com/OpenPrinting/cups/releases/download/v$CUPS_VERSION/cups-v$CUPS_VERSION-source.tar.gz + - wget -q https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-$CUPS_VERSION-source.tar.gz - rpmbuild -ta --without libusb1 cups-${CUPS_VERSION##v}-source.tar.gz - name: checksum @@ -94,6 +92,6 @@ depends_on: --- kind: signature -hmac: 6a222591b75dd1b22d278467cb82fcac5fbba807607ce61f3335a160a0644515 +hmac: acd5875df015c9b10b95c26b65b1f53a7126438b5d71ba519411ce9d9754008f ... -- 2.24.4 From 8a3ab671b76a07ad4c3c4a293922f4112a361df8 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:57:14 +0200 Subject: [PATCH 07/22] fix download url --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 316f0d2..dd29c32 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: image: thegeeklab/rpmbuild:7 commands: - source /drone/src/.drone.env - - wget -q https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-$CUPS_VERSION-source.tar.gz + - wget -q https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-${CUPS_VERSION##v}-source.tar.gz - rpmbuild -ta --without libusb1 cups-${CUPS_VERSION##v}-source.tar.gz - name: checksum @@ -92,6 +92,6 @@ depends_on: --- kind: signature -hmac: acd5875df015c9b10b95c26b65b1f53a7126438b5d71ba519411ce9d9754008f +hmac: d8089ad4fcdd694f8d760e4eefda3ceda6c2c8a41e349cd83b5cf08bc60a1769 ... -- 2.24.4 From b03992e49b053ae9f55dd933a7cd41b84b50424b Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:57:56 +0200 Subject: [PATCH 08/22] fix download url --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index dd29c32..e574eec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,8 @@ steps: image: thegeeklab/rpmbuild:7 commands: - source /drone/src/.drone.env - - wget -q https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-${CUPS_VERSION##v}-source.tar.gz + - echo "https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-${CUPS_VERSION##v}-source.tar.gz" + - wget -q "https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-${CUPS_VERSION##v}-source.tar.gz" - rpmbuild -ta --without libusb1 cups-${CUPS_VERSION##v}-source.tar.gz - name: checksum @@ -92,6 +93,6 @@ depends_on: --- kind: signature -hmac: d8089ad4fcdd694f8d760e4eefda3ceda6c2c8a41e349cd83b5cf08bc60a1769 +hmac: 0336217b7833aa79b85a5e88529c558710c15bc48cbc15ba50bd4146d126d28f ... -- 2.24.4 From 92345ffc4a91d15c8932bfb3330a493779999764 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 17:00:55 +0200 Subject: [PATCH 09/22] fix download url --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index e574eec..1bc5459 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,9 +11,9 @@ steps: image: thegeeklab/rpmbuild:7 commands: - source /drone/src/.drone.env - - echo "https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-${CUPS_VERSION##v}-source.tar.gz" - - wget -q "https://github.com/OpenPrinting/cups/releases/download/$CUPS_VERSION/cups-${CUPS_VERSION##v}-source.tar.gz" - - rpmbuild -ta --without libusb1 cups-${CUPS_VERSION##v}-source.tar.gz + - echo "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" + - wget -q "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" + - rpmbuild -ta --without libusb1 cups-$${CUPS_VERSION##v}-source.tar.gz - name: checksum image: thegee @@ -93,6 +93,6 @@ depends_on: --- kind: signature -hmac: 0336217b7833aa79b85a5e88529c558710c15bc48cbc15ba50bd4146d126d28f +hmac: b4923bb7f5aa35db11986451b012a5e3e123aa76104a3e4a0c7a009778dc2c5d ... -- 2.24.4 From dae77c3048f703e854ff41950bc67000e1cd2786 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 17:08:24 +0200 Subject: [PATCH 10/22] use make --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1bc5459..29b6fd1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,9 +11,9 @@ steps: image: thegeeklab/rpmbuild:7 commands: - source /drone/src/.drone.env - - echo "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" - - wget -q "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" - - rpmbuild -ta --without libusb1 cups-$${CUPS_VERSION##v}-source.tar.gz + - mkdir -p /drone/src/source + - curl -sSL "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" | tar xz -C /drone/src/source --strip-components=1 + - cd /drone/src/source && make rpm - name: checksum image: thegee @@ -93,6 +93,6 @@ depends_on: --- kind: signature -hmac: b4923bb7f5aa35db11986451b012a5e3e123aa76104a3e4a0c7a009778dc2c5d +hmac: b41b3fbbc1076a7a9d6680145b13494c05f686722bfaa5fd21278d1f3c7b3f51 ... -- 2.24.4 From d4515a3e3982b350e322f0d646e7c1fa077412b3 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 17:55:43 +0200 Subject: [PATCH 11/22] fix rpmbuild --- .drone.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 29b6fd1..f85e630 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,9 +11,8 @@ steps: image: thegeeklab/rpmbuild:7 commands: - source /drone/src/.drone.env - - mkdir -p /drone/src/source - - curl -sSL "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" | tar xz -C /drone/src/source --strip-components=1 - - cd /drone/src/source && make rpm + - wget -q "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" + - rm -rf /etc/xinetd.d/ && rpmbuild -ta --without libusb1 cups-$${CUPS_VERSION##v}-source.tar.gz - name: checksum image: thegee @@ -93,6 +92,6 @@ depends_on: --- kind: signature -hmac: b41b3fbbc1076a7a9d6680145b13494c05f686722bfaa5fd21278d1f3c7b3f51 +hmac: 1ef9f6c7c212d894c1ae7f624c572ca1d4b0c52897a4a204fe466bc07bc70b3a ... -- 2.24.4 From 9d0d4d714e18304828855432677d190f360a4fbf Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 17:59:43 +0200 Subject: [PATCH 12/22] fix checksume base image --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index f85e630..34e522f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ steps: - rm -rf /etc/xinetd.d/ && rpmbuild -ta --without libusb1 cups-$${CUPS_VERSION##v}-source.tar.gz - name: checksum - image: thegee + image: alpine commands: - cd /drone/src/dist/RPMS/x86_64/ && sha256sum * > /drone/src/dist/sha256sum.txt @@ -92,6 +92,6 @@ depends_on: --- kind: signature -hmac: 1ef9f6c7c212d894c1ae7f624c572ca1d4b0c52897a4a204fe466bc07bc70b3a +hmac: 5377f2e1d6b9b7b6b723a5e5b8ac8d776685bfac4c1fa2955864accffbe616f7 ... -- 2.24.4 From b5d7b1a937987da9b7a6abb9892352efd5cfd694 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 18:02:52 +0200 Subject: [PATCH 13/22] add chglog config --- .chglog/CHANGELOG.tpl.md | 23 +++++++++++++++++++++++ .chglog/config.yml | 25 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100755 .chglog/CHANGELOG.tpl.md create mode 100755 .chglog/config.yml diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md new file mode 100755 index 0000000..4d6bff8 --- /dev/null +++ b/.chglog/CHANGELOG.tpl.md @@ -0,0 +1,23 @@ +# Changelog + +{{ range .Versions -}} +## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }}) + +{{ range .CommitGroups -}} +### {{ .Title }} + +{{ range .Commits -}} +- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ (regexReplaceAll "(Co-\\w*-by.*)" .Subject "") | trim }} +{{ end }} +{{- end -}} + +{{- if .NoteGroups -}} +{{ range .NoteGroups -}} +### {{ .Title }} + +{{ range .Notes }} +{{ .Body }} +{{ end }} +{{ end -}} +{{ end -}} +{{ end -}} diff --git a/.chglog/config.yml b/.chglog/config.yml new file mode 100755 index 0000000..24cbc5f --- /dev/null +++ b/.chglog/config.yml @@ -0,0 +1,25 @@ +style: github +template: CHANGELOG.tpl.md +info: + title: CHANGELOG + repository_url: https://gitea.rknet.org/rpmbuild/cups +options: + commit_groups: + title_maps: + feat: Features + fix: Bug Fixes + perf: Performance Improvements + refactor: Code Refactoring + chore: Others + test: Testing + ci: CI Pipeline + docs: Documentation + header: + pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$" + pattern_maps: + - Type + - Scope + - Subject + notes: + keywords: + - BREAKING CHANGE -- 2.24.4 From 7d81567b45f3eb46c22f16d23e0f3a4eaf18462d Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 22:32:28 +0200 Subject: [PATCH 14/22] use custom spec file --- .drone.yml | 6 +- cups.spec | 442 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 445 insertions(+), 3 deletions(-) create mode 100644 cups.spec diff --git a/.drone.yml b/.drone.yml index 34e522f..b5b642c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,8 +11,8 @@ steps: image: thegeeklab/rpmbuild:7 commands: - source /drone/src/.drone.env - - wget -q "https://github.com/OpenPrinting/cups/releases/download/$${CUPS_VERSION}/cups-$${CUPS_VERSION##v}-source.tar.gz" - - rm -rf /etc/xinetd.d/ && rpmbuild -ta --without libusb1 cups-$${CUPS_VERSION##v}-source.tar.gz + - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec + - ls -l /drone/src/dist/RPMS/x86_64/ - name: checksum image: alpine @@ -92,6 +92,6 @@ depends_on: --- kind: signature -hmac: 5377f2e1d6b9b7b6b723a5e5b8ac8d776685bfac4c1fa2955864accffbe616f7 +hmac: 2f198a2cd406784b1901571b23734c06c5324a1ff36491eee93f1b729df7e598 ... diff --git a/cups.spec b/cups.spec new file mode 100644 index 0000000..4f41336 --- /dev/null +++ b/cups.spec @@ -0,0 +1,442 @@ +# +# RPM "spec" file for CUPS. +# +# Original version by Jason McMullan . +# +# Copyright © 2020 by OpenPrinting +# Copyright © 2007-2019 by Apple Inc. +# Copyright © 1999-2007 by Easy Software Products, all rights reserved. +# +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. +# + +# Conditional build options (--with name/--without name): +# +# dbus - Enable/disable DBUS support (default = enable) +# dnssd - Enable/disable DNS-SD support (default = enable) +# libusb1 - Enable/disable LIBUSB 1.0 support (default = enable) +# static - Enable/disable static libraries (default = enable) +# systemd - Enable/disable systemd support (default = enable) + +%{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}} +%{?_with_dbus: %define _dbus --enable-dbus} +%{!?_with_dbus: %define _dbus --disable-dbus} + +%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}} +%{?_with_dnssd: %define _dnssd --enable-avahi} +%{!?_with_dnssd: %define _dnssd --disable-avahi} + +%{!?_with_libusb1: %{!?_without_libusb1: %define _with_libusb1 --with-libusb1}} +%{?_with_libusb1: %define _libusb1 --enable-libusb} +%{!?_with_libusb1: %define _libusb1 --disable-libusb} + +%{!?_with_static: %{!?_without_static: %define _without_static --without-static}} +%{?_with_static: %define _static --enable-static} +%{!?_with_static: %define _static --disable-static} + +%{!?_with_systemd: %{!?_without_systemd: %define _with_systemd --with-systemd}} +%{?_with_systemd: %define _systemd --enable-systemd} +%{!?_with_systemd: %define _systemd --disable-systemd} + +%undefine _disable_source_fetch + +Summary: CUPS +Name: cups +Version: %{version_} +Release: 0%{?dist} +Epoch: 1 +License: GPL +Group: System Environment/Daemons +Source: https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz +Url: http://www.cups.org +Packager: Anonymous +Vendor: OpenPrinting + +# Package names are as defined for Red Hat (and clone) distributions +BuildRequires: gnutls-devel, pam-devel + +%if %{?_with_dbus:1}%{!?_with_dbus:0} +BuildRequires: dbus-devel +%endif + +%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +BuildRequires: avahi-devel +%endif + +%if %{?_with_libusb1:1}%{!?_with_libusb1:0} +BuildRequires: libusb-devel >= 1.0 +%endif + +%if %{?_with_systemd:1}%{!?_with_systemd:0} +BuildRequires: systemd-devel +%endif + +# Use buildroot so as not to disturb the version already installed +BuildRoot: /tmp/%{name}-root + +# Dependencies... +Requires: %{name}-libs = %{epoch}:%{version} +Obsoletes: lpd, lpr, LPRng +Provides: lpd, lpr, LPRng +Obsoletes: cups-da, cups-de, cups-es, cups-et, cups-fi, cups-fr, cups-he +Obsoletes: cups-id, cups-it, cups-ja, cups-ko, cups-nl, cups-no, cups-pl +Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh + +%package devel +Summary: CUPS - development environment +Group: Development/Libraries +Requires: %{name}-libs = %{epoch}:%{version} + +%package libs +Summary: CUPS - shared libraries +Group: System Environment/Libraries +Provides: libcups1 + +%package lpd +Summary: CUPS - LPD support +Group: System Environment/Daemons +Requires: %{name} = %{epoch}:%{version} xinetd + +%description +CUPS is the standards-based, open source printing system developed by +Apple Inc. and maintained by OpenPrinting for macOS® and other UNIX®-like +operating systems. + +%description devel +This package provides the CUPS headers and development environment. + +%description libs +This package provides the CUPS shared libraries. + +%description lpd +This package provides LPD client support. + +%prep +%setup + +%build +CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ + ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd} +# If we got this far, all prerequisite libraries must be here. +make + +%install +# Make sure the RPM_BUILD_ROOT directory exists. +rm -rf $RPM_BUILD_ROOT + +make BUILDROOT=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/data + +%post +%if %{?_with_systemd:1}%{!?_with_systemd:0} +/bin/systemctl enable cups.service + +if test $1 -ge 1; then + /bin/systemctl stop cups.service + /bin/systemctl start cups.service +fi + +%else +/sbin/chkconfig --add cups +/sbin/chkconfig cups on + +# Restart cupsd if we are upgrading... +if test $1 -gt 1; then + /sbin/service cups stop + /sbin/service cups start +fi +%endif + +%post libs +/sbin/ldconfig + +%preun +%if %{?_with_systemd:1}%{!?_with_systemd:0} +if test $1 -ge 1; then + /bin/systemctl stop cups.service + /bin/systemctl disable cups.service +fi + +%else +if test $1 = 0; then + /sbin/service cups stop + /sbin/chkconfig --del cups +fi +%endif + +%postun +%if %{?_with_systemd:1}%{!?_with_systemd:0} +if test $1 -ge 1; then + /bin/systemctl stop cups.service + /bin/systemctl start cups.service +fi + +%else +if test $1 -ge 1; then + /sbin/service cups stop + /sbin/service cups start +fi +%endif + +%postun libs +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%docdir /usr/share/doc/cups +%defattr(-,root,root) +%dir /etc/cups +%config(noreplace) /etc/cups/*.conf +/etc/cups/cups-files.conf.default +/etc/cups/cupsd.conf.default +/etc/cups/snmp.conf.default +%dir /etc/cups/ppd +%attr(0700,root,root) %dir /etc/cups/ssl + +%if %{?_with_dbus:1}%{!?_with_dbus:0} +# DBUS +/etc/dbus-1/system.d/* +%endif + +# PAM +%dir /etc/pam.d +/etc/pam.d/* + +%if %{?_with_systemd:1}%{!?_with_systemd:0} +# SystemD +/usr/lib/systemd/system/cups.* + +%else +# Legacy init support on Linux +/etc/init.d/* +/etc/rc0.d/* +/etc/rc2.d/* +/etc/rc3.d/* +/etc/rc5.d/* +%endif + +/usr/bin/cancel +/usr/bin/cupstestppd +/usr/bin/ippeveprinter +/usr/bin/ipptool +/usr/bin/lp* +%dir /usr/lib/cups +%dir /usr/lib/cups/backend +%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +# DNS-SD +/usr/bin/ippfind +/usr/lib/cups/backend/dnssd +%endif +/usr/lib/cups/backend/http +/usr/lib/cups/backend/https +%attr(0700,root,root) /usr/lib/cups/backend/ipp +/usr/lib/cups/backend/ipps +%attr(0700,root,root) /usr/lib/cups/backend/lpd +/usr/lib/cups/backend/snmp +/usr/lib/cups/backend/socket +/usr/lib/cups/backend/usb +%dir /usr/lib/cups/cgi-bin +/usr/lib/cups/cgi-bin/* +%dir /usr/lib/cups/command +/usr/lib/cups/command/* +%dir /usr/lib/cups/daemon +/usr/lib/cups/daemon/cups-deviced +/usr/lib/cups/daemon/cups-driverd +/usr/lib/cups/daemon/cups-exec +%dir /usr/lib/cups/driver +%dir /usr/lib/cups/filter +/usr/lib/cups/filter/* +%dir /usr/lib/cups/monitor +/usr/lib/cups/monitor/* +%dir /usr/lib/cups/notifier +/usr/lib/cups/notifier/* + +/usr/sbin/* +%dir /usr/share/cups +%dir /usr/share/cups/drv +/usr/share/cups/drv/* +%dir /usr/share/cups/ipptool +/usr/share/cups/ipptool/* +%dir /usr/share/cups/mime +/usr/share/cups/mime/* +%dir /usr/share/cups/model +%dir /usr/share/cups/ppdc +/usr/share/cups/ppdc/* +%dir /usr/share/cups/templates +/usr/share/cups/templates/* +%if %{?_with_libusb1:1}%{!?_with_libusb1:0} +# LIBUSB quirks files +%dir /usr/share/cups/usb +/usr/share/cups/usb/* +%endif + +%dir /usr/share/doc/cups +/usr/share/doc/cups/*.* +%dir /usr/share/doc/cups/help +/usr/share/doc/cups/help/accounting.html +/usr/share/doc/cups/help/admin.html +/usr/share/doc/cups/help/cgi.html +/usr/share/doc/cups/help/encryption.html +/usr/share/doc/cups/help/firewalls.html +/usr/share/doc/cups/help/glossary.html +/usr/share/doc/cups/help/kerberos.html +/usr/share/doc/cups/help/license.html +/usr/share/doc/cups/help/man-*.html +/usr/share/doc/cups/help/network.html +/usr/share/doc/cups/help/options.html +/usr/share/doc/cups/help/overview.html +/usr/share/doc/cups/help/policies.html +/usr/share/doc/cups/help/ref-*.html +/usr/share/doc/cups/help/security.html +/usr/share/doc/cups/help/sharing.html +/usr/share/doc/cups/help/translation.html +%dir /usr/share/doc/cups/images +/usr/share/doc/cups/images/* + +#%dir /usr/share/doc/cups/ca +#/usr/share/doc/cups/ca/* +#%dir /usr/share/doc/cups/cs +#/usr/share/doc/cups/cs/* +%dir /usr/share/doc/cups/de +/usr/share/doc/cups/de/* +%dir /usr/share/doc/cups/es +/usr/share/doc/cups/es/* +#%dir /usr/share/doc/cups/fr +#/usr/share/doc/cups/fr/* +%dir /usr/share/doc/cups/ja +/usr/share/doc/cups/ja/* +%dir /usr/share/doc/cups/pt_BR +/usr/share/doc/cups/pt_BR/* +%dir /usr/share/doc/cups/ru +/usr/share/doc/cups/ru/* + +%dir /usr/share/locale/ca +/usr/share/locale/ca/cups_ca.po +%dir /usr/share/locale/cs +/usr/share/locale/cs/cups_cs.po +%dir /usr/share/locale/de +/usr/share/locale/de/cups_de.po +%dir /usr/share/locale/en +/usr/share/locale/en/cups_en.po +%dir /usr/share/locale/es +/usr/share/locale/es/cups_es.po +%dir /usr/share/locale/fr +/usr/share/locale/fr/cups_fr.po +%dir /usr/share/locale/it +/usr/share/locale/it/cups_it.po +%dir /usr/share/locale/ja +/usr/share/locale/ja/cups_ja.po +%dir /usr/share/locale/pt_BR +/usr/share/locale/pt_BR/cups_pt_BR.po +%dir /usr/share/locale/ru +/usr/share/locale/ru/cups_ru.po +%dir /usr/share/locale/zh_CN +/usr/share/locale/zh_CN/cups_zh_CN.po + +%dir /usr/share/man/man1 +/usr/share/man/man1/cancel.1.gz +/usr/share/man/man1/cups.1.gz +/usr/share/man/man1/cupstestppd.1.gz +/usr/share/man/man1/ippeveprinter.1.gz +%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +# DNS-SD +/usr/share/man/man1/ippfind.1.gz +%endif +/usr/share/man/man1/ipptool.1.gz +/usr/share/man/man1/lp.1.gz +/usr/share/man/man1/lpoptions.1.gz +/usr/share/man/man1/lpq.1.gz +/usr/share/man/man1/lpr.1.gz +/usr/share/man/man1/lprm.1.gz +/usr/share/man/man1/lpstat.1.gz +%dir /usr/share/man/man5 +/usr/share/man/man5/*.conf.5.gz +/usr/share/man/man5/cupsd-logs.5.gz +/usr/share/man/man5/ipptoolfile.5.gz +/usr/share/man/man5/mime.*.5.gz +%dir /usr/share/man/man7 +/usr/share/man/man7/ippevepcl.7.gz +/usr/share/man/man7/ippeveps.7.gz +%dir /usr/share/man/man8 +/usr/share/man/man8/cups-deviced.8.gz +/usr/share/man/man8/cups-driverd.8.gz +/usr/share/man/man8/cups-exec.8.gz +/usr/share/man/man8/cups-snmp.8.gz +/usr/share/man/man8/cupsaccept.8.gz +/usr/share/man/man8/cupsctl.8.gz +/usr/share/man/man8/cupsfilter.8.gz +/usr/share/man/man8/cupsd.8.gz +/usr/share/man/man8/cupsd-helper.8.gz +/usr/share/man/man8/cupsdisable.8.gz +/usr/share/man/man8/cupsenable.8.gz +/usr/share/man/man8/cupsreject.8.gz +/usr/share/man/man8/lpadmin.8.gz +/usr/share/man/man8/lpc.8.gz +/usr/share/man/man8/lpinfo.8.gz +/usr/share/man/man8/lpmove.8.gz + +%dir /var/cache/cups +%attr(0775,root,sys) %dir /var/cache/cups/rss +%dir /var/log/cups +%dir /var/run/cups +%attr(0711,lp,sys) %dir /var/run/cups/certs +%attr(0710,lp,sys) %dir /var/spool/cups +%attr(1770,lp,sys) %dir /var/spool/cups/tmp + +# Desktop files +/usr/share/applications/* +/usr/share/icons/* + +%files devel +%defattr(-,root,root) +%dir /usr/share/cups/examples +/usr/share/cups/examples/* +%dir /usr/share/man/man1 +/usr/share/man/man1/cups-config.1.gz +/usr/share/man/man1/ppd*.1.gz +%dir /usr/share/man/man5 +/usr/share/man/man5/ppdcfile.5.gz +/usr/share/man/man7/backend.7.gz +/usr/share/man/man7/filter.7.gz +/usr/share/man/man7/notifier.7.gz + +/usr/bin/cups-config +/usr/bin/ppd* +%dir /usr/include/cups +/usr/include/cups/* +/usr/lib*/*.so + +%if %{?_with_static:1}%{!?_with_static:0} +/usr/lib*/*.a +%endif + +%dir /usr/share/doc/cups/help +/usr/share/doc/cups/help/api*.html +/usr/share/doc/cups/help/cupspm.* +/usr/share/doc/cups/help/postscript-driver.html +/usr/share/doc/cups/help/ppd-compiler.html +/usr/share/doc/cups/help/raster-driver.html +/usr/share/doc/cups/help/spec*.html + +%files libs +%defattr(-,root,root) +/usr/lib*/*.so.* + +%files lpd +%defattr(-,root,root) +%if %{?_with_systemd:1}%{!?_with_systemd:0} +# SystemD +/usr/lib/systemd/system/cups-lpd* +%else +# Legacy xinetd +/etc/xinetd.d/cups-lpd +%endif + +%dir /usr/lib/cups +%dir /usr/lib/cups/daemon +/usr/lib/cups/daemon/cups-lpd +%dir /usr/share/man/man8 +/usr/share/man/man8/cups-lpd.8.gz -- 2.24.4 From e26c98e499bf93b9fd1046f64ab2d0cf82af95e1 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 22:52:07 +0200 Subject: [PATCH 15/22] build el7 and el8 --- .drone.jsonnet | 150 +++++++++++++++++++++++++++++++++++++++++++++++++ .drone.yml | 58 ++++++++++++++++--- 2 files changed, 201 insertions(+), 7 deletions(-) create mode 100644 .drone.jsonnet diff --git a/.drone.jsonnet b/.drone.jsonnet new file mode 100644 index 0000000..0cf43b4 --- /dev/null +++ b/.drone.jsonnet @@ -0,0 +1,150 @@ +local PipelineTest = { + kind: 'pipeline', + name: 'test', + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + { + name: 'markdownlint', + image: 'thegeeklab/markdownlint-cli', + commands: [ + "markdownlint 'README.md'", + ], + }, + ], + trigger: { + ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + }, +}; + +local DistVersion(version='7') = { + name: 'build-el' + version, + image: 'thegeeklab/rpmbuild:' + version, + commands: [ + 'source /drone/src/.drone.env', + 'rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec', + 'ls -l /drone/src/dist/RPMS/x86_64/', + ], + depends_on: [ + 'clone', + ], +}; + + +local PipelineBuildPackage = { + kind: 'pipeline', + name: 'build-packages', + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + DistVersion(version='7'), + DistVersion(version='8'), + { + name: 'checksum', + image: 'alpine', + commands: [ + 'cd /drone/src/dist/RPMS/x86_64/ && sha256sum * > /drone/src/dist/sha256sum.txt', + ], + depends_on: [ + 'build-el7', + 'build-el8', + ], + }, + { + name: 'changelog-generate', + image: 'thegeeklab/git-chglog', + commands: [ + 'git fetch -tq', + 'git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}', + ], + depends_on: [ + 'checksum', + ], + }, + { + name: 'changelog-format', + image: 'thegeeklab/alpine-tools', + commands: [ + 'prettier CHANGELOG.md', + 'prettier -w CHANGELOG.md', + ], + depends_on: [ + 'changelog-generate', + ], + }, + { + name: 'publish-gitea', + image: 'plugins/gitea-release', + settings: { + api_key: { + from_secret: 'gitea_token', + }, + base_url: 'https://gitea.rknet.org', + files: [ + '/drone/src/dist/RPMS/x86_64/*', + '/drone/src/dist/sha256sum.txt', + ], + note: 'CHANGELOG.md', + overwrite: true, + title: '${DRONE_TAG}', + }, + when: { + ref: [ + 'refs/tags/**', + ], + }, + depends_on: [ + 'changelog-format', + ], + }, + ], + depends_on: [ + 'test', + ], + trigger: { + ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + }, +}; + +local PipelineNotifications = { + kind: 'pipeline', + name: 'notifications', + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + { + name: 'matrix', + image: 'thegeeklab/drone-matrix', + settings: { + homeserver: { from_secret: 'matrix_homeserver' }, + roomid: { from_secret: 'matrix_roomid' }, + template: 'Status: **{{ build.Status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}', + username: { from_secret: 'matrix_username' }, + password: { from_secret: 'matrix_password' }, + }, + when: { + status: ['success', 'failure'], + }, + }, + ], + depends_on: [ + 'build-package-el7', + 'build-package-el8', + ], + trigger: { + ref: ['refs/heads/master', 'refs/tags/**'], + status: ['success', 'failure'], + }, +}; + +[ + PipelineTest, + PipelineBuildPackage, + PipelineNotifications, +] diff --git a/.drone.yml b/.drone.yml index b5b642c..0a3fdfa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,35 +1,73 @@ --- kind: pipeline -name: build +name: test platform: os: linux arch: amd64 steps: - - name: build + - name: markdownlint + image: thegeeklab/markdownlint-cli + commands: + - markdownlint 'README.md' + +trigger: + ref: + - refs/heads/master + - refs/tags/** + - refs/pull/** + +--- +kind: pipeline +name: build-packages + +platform: + os: linux + arch: amd64 + +steps: + - name: build-el7 image: thegeeklab/rpmbuild:7 commands: - source /drone/src/.drone.env - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec - ls -l /drone/src/dist/RPMS/x86_64/ + depends_on: + - clone + + - name: build-el8 + image: thegeeklab/rpmbuild:8 + commands: + - source /drone/src/.drone.env + - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec + - ls -l /drone/src/dist/RPMS/x86_64/ + depends_on: + - clone - name: checksum image: alpine commands: - cd /drone/src/dist/RPMS/x86_64/ && sha256sum * > /drone/src/dist/sha256sum.txt + depends_on: + - build-el7 + - build-el8 - name: changelog-generate image: thegeeklab/git-chglog commands: - git fetch -tq - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased} + depends_on: + - checksum - name: changelog-format image: thegeeklab/alpine-tools commands: - prettier CHANGELOG.md - prettier -w CHANGELOG.md + depends_on: + - changelog-generate - name: publish-gitea image: plugins/gitea-release @@ -46,16 +84,21 @@ steps: when: ref: - refs/tags/** + depends_on: + - changelog-format trigger: ref: - - refs/heads/main - - refs/pull/** + - refs/heads/master - refs/tags/** + - refs/pull/** + +depends_on: + - test --- kind: pipeline -name: notification +name: notifications platform: os: linux @@ -88,10 +131,11 @@ trigger: - failure depends_on: - - build + - build-package-el7 + - build-package-el8 --- kind: signature -hmac: 2f198a2cd406784b1901571b23734c06c5324a1ff36491eee93f1b729df7e598 +hmac: b143143461a0b81a3b401c00e28733d145280200c467c5f4168785db8b0c3ff8 ... -- 2.24.4 From 8eaaebf2011f94cf8b5b457394a8a2d93177f8b2 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 22:53:19 +0200 Subject: [PATCH 16/22] fix pipeline deps --- .drone.jsonnet | 3 +-- .drone.yml | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0cf43b4..ed9a4d9 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -134,8 +134,7 @@ local PipelineNotifications = { }, ], depends_on: [ - 'build-package-el7', - 'build-package-el8', + 'build-packages', ], trigger: { ref: ['refs/heads/master', 'refs/tags/**'], diff --git a/.drone.yml b/.drone.yml index 0a3fdfa..c8ce976 100644 --- a/.drone.yml +++ b/.drone.yml @@ -131,11 +131,10 @@ trigger: - failure depends_on: - - build-package-el7 - - build-package-el8 + - build-packages --- kind: signature -hmac: b143143461a0b81a3b401c00e28733d145280200c467c5f4168785db8b0c3ff8 +hmac: 388c28bb151ee8e9c4a75e64ad273abcbe2c955e4b35eaa57697ccd08d77b72b ... -- 2.24.4 From 010c2cbd731df29d04daa59f80942674cad5d8a0 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 22:53:59 +0200 Subject: [PATCH 17/22] add rep config files --- .markdownlint.yml | 6 ++++++ .prettierignore | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 .markdownlint.yml create mode 100644 .prettierignore diff --git a/.markdownlint.yml b/.markdownlint.yml new file mode 100644 index 0000000..b59a114 --- /dev/null +++ b/.markdownlint.yml @@ -0,0 +1,6 @@ +--- +default: True +MD013: False +MD041: False +MD004: + style: dash diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..97e0b3e --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +.drone.yml +*.tpl.md -- 2.24.4 From ab8b05f06147a401aa5dc666688437d7d593cd8e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 22:57:50 +0200 Subject: [PATCH 18/22] adjust readme --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c9c895..9f87977 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ # cups -[![Build Status](https://drone.rknet.org/api/badges/rpmbuild/cups/status.svg)](https://drone.rknet.org/rpmbuild/cups) +[![Build Status](https://img.shields.io/drone/build/rpmbuild/cups?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/rpmbuild/cups) +[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/rpmbuild/cups/src/branch/master/LICENSE) -[CUPS](https://github.com/apple/cups) is a standards-based, open source printing system developed by Apple Inc. +[OpenPrinting CUPS](https://github.com/OpenPrinting/cups) is a standards-based, open source printing system for Linux® and other Unix®-like operating systems. -This repository is a simple wrapper to provide CI driven RMP builds from upstream releases. All RPM's are built under CentOS 7. +This repository is a simple wrapper to provide CI driven RMP builds from upstream releases. +## License + +This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/rpmbuild/cups/src/branch/master/LICENSE) file for details. -- 2.24.4 From e96541582aebe1acf16335778970675fb4897ac9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 23:01:01 +0200 Subject: [PATCH 19/22] dont run builds in parallel --- .drone.jsonnet | 16 ---------------- .drone.yml | 15 +-------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index ed9a4d9..bef4f36 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -27,9 +27,6 @@ local DistVersion(version='7') = { 'rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec', 'ls -l /drone/src/dist/RPMS/x86_64/', ], - depends_on: [ - 'clone', - ], }; @@ -49,10 +46,6 @@ local PipelineBuildPackage = { commands: [ 'cd /drone/src/dist/RPMS/x86_64/ && sha256sum * > /drone/src/dist/sha256sum.txt', ], - depends_on: [ - 'build-el7', - 'build-el8', - ], }, { name: 'changelog-generate', @@ -61,9 +54,6 @@ local PipelineBuildPackage = { 'git fetch -tq', 'git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}', ], - depends_on: [ - 'checksum', - ], }, { name: 'changelog-format', @@ -72,9 +62,6 @@ local PipelineBuildPackage = { 'prettier CHANGELOG.md', 'prettier -w CHANGELOG.md', ], - depends_on: [ - 'changelog-generate', - ], }, { name: 'publish-gitea', @@ -97,9 +84,6 @@ local PipelineBuildPackage = { 'refs/tags/**', ], }, - depends_on: [ - 'changelog-format', - ], }, ], depends_on: [ diff --git a/.drone.yml b/.drone.yml index c8ce976..99e0a63 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,8 +33,6 @@ steps: - source /drone/src/.drone.env - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec - ls -l /drone/src/dist/RPMS/x86_64/ - depends_on: - - clone - name: build-el8 image: thegeeklab/rpmbuild:8 @@ -42,32 +40,23 @@ steps: - source /drone/src/.drone.env - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec - ls -l /drone/src/dist/RPMS/x86_64/ - depends_on: - - clone - name: checksum image: alpine commands: - cd /drone/src/dist/RPMS/x86_64/ && sha256sum * > /drone/src/dist/sha256sum.txt - depends_on: - - build-el7 - - build-el8 - name: changelog-generate image: thegeeklab/git-chglog commands: - git fetch -tq - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased} - depends_on: - - checksum - name: changelog-format image: thegeeklab/alpine-tools commands: - prettier CHANGELOG.md - prettier -w CHANGELOG.md - depends_on: - - changelog-generate - name: publish-gitea image: plugins/gitea-release @@ -84,8 +73,6 @@ steps: when: ref: - refs/tags/** - depends_on: - - changelog-format trigger: ref: @@ -135,6 +122,6 @@ depends_on: --- kind: signature -hmac: 388c28bb151ee8e9c4a75e64ad273abcbe2c955e4b35eaa57697ccd08d77b72b +hmac: 434121da11bd25646d26f4d217863951acb3a03cb8c373814a4254002f1a710e ... -- 2.24.4 From d3c1b97697de59d0882173be70952f6702306714 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 23:09:44 +0200 Subject: [PATCH 20/22] temp disable el7 --- .drone.jsonnet | 2 +- .drone.yml | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index bef4f36..e9a6d4b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -38,7 +38,7 @@ local PipelineBuildPackage = { arch: 'amd64', }, steps: [ - DistVersion(version='7'), + // DistVersion(version='7'), DistVersion(version='8'), { name: 'checksum', diff --git a/.drone.yml b/.drone.yml index 99e0a63..4d43fcf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,13 +27,6 @@ platform: arch: amd64 steps: - - name: build-el7 - image: thegeeklab/rpmbuild:7 - commands: - - source /drone/src/.drone.env - - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec - - ls -l /drone/src/dist/RPMS/x86_64/ - - name: build-el8 image: thegeeklab/rpmbuild:8 commands: @@ -122,6 +115,6 @@ depends_on: --- kind: signature -hmac: 434121da11bd25646d26f4d217863951acb3a03cb8c373814a4254002f1a710e +hmac: 6cea4ffb42a9a10fdbbb53d535276a88e8e5499fc6d2cf55af17b038aa9d50cb ... -- 2.24.4 From f88b8ec4b4b143e68cd1574f88c5d13a7c55878d Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 23:34:50 +0200 Subject: [PATCH 21/22] fix el8 builds --- .drone.jsonnet | 4 ++-- .drone.yml | 4 ++-- cups.spec | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index e9a6d4b..22c0db3 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -24,7 +24,7 @@ local DistVersion(version='7') = { image: 'thegeeklab/rpmbuild:' + version, commands: [ 'source /drone/src/.drone.env', - 'rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec', + 'rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec', 'ls -l /drone/src/dist/RPMS/x86_64/', ], }; @@ -38,7 +38,7 @@ local PipelineBuildPackage = { arch: 'amd64', }, steps: [ - // DistVersion(version='7'), + DistVersion(version='7'), DistVersion(version='8'), { name: 'checksum', diff --git a/.drone.yml b/.drone.yml index 4d43fcf..e11c0d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ steps: image: thegeeklab/rpmbuild:8 commands: - source /drone/src/.drone.env - - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec + - rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec - ls -l /drone/src/dist/RPMS/x86_64/ - name: checksum @@ -115,6 +115,6 @@ depends_on: --- kind: signature -hmac: 6cea4ffb42a9a10fdbbb53d535276a88e8e5499fc6d2cf55af17b038aa9d50cb +hmac: 5a50892d1993ab7fdfbab90f5b66a3f665b9d9e9ffa058642c2b3970368f02f3 ... diff --git a/cups.spec b/cups.spec index 4f41336..e343160 100644 --- a/cups.spec +++ b/cups.spec @@ -117,7 +117,13 @@ This package provides LPD client support. %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ - ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd} + ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd} \ + --enable-debug \ + --with-exe-file-perm=0755 \ + --with-cupsd-file-perm=0755 \ + --with-log-file-perm=0600 \ + --with-xinetd=no + # If we got this far, all prerequisite libraries must be here. make -- 2.24.4 From ec0f8ce255720c5e5dec17d40d986fe2774449d7 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 23:40:55 +0200 Subject: [PATCH 22/22] fix el8 builds --- .drone.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e11c0d0..a866248 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,6 +27,13 @@ platform: arch: amd64 steps: + - name: build-el7 + image: thegeeklab/rpmbuild:7 + commands: + - source /drone/src/.drone.env + - rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec + - ls -l /drone/src/dist/RPMS/x86_64/ + - name: build-el8 image: thegeeklab/rpmbuild:8 commands: @@ -115,6 +122,6 @@ depends_on: --- kind: signature -hmac: 5a50892d1993ab7fdfbab90f5b66a3f665b9d9e9ffa058642c2b3970368f02f3 +hmac: e3a4496149a9d12470fe6ccf27240160f1a52e62320541e0828c1bc65e2696e1 ... -- 2.24.4