diff options
| -rwxr-xr-x | bin/debian-chroot | 2 | ||||
| -rwxr-xr-x | bin/pbuild.sh | 2 | ||||
| -rwxr-xr-x | bin/psign.sh | 12 | ||||
| -rwxr-xr-x | web/todo.sh | 2 | ||||
| -rwxr-xr-x | web/update | 64 | ||||
| -rwxr-xr-x | web/update.FIXME | 271 |
6 files changed, 43 insertions, 310 deletions
diff --git a/bin/debian-chroot b/bin/debian-chroot index 22e4d4c..f36a29e 100755 --- a/bin/debian-chroot +++ b/bin/debian-chroot @@ -172,7 +172,7 @@ EOF Chroot apt dist-upgrade --yes Chroot apt install --yes \ - build-essential debhelper fakeroot + build-essential debhelper fakeroot eatmydata Chroot apt install --yes \ gnupg sudo wget diff --git a/bin/pbuild.sh b/bin/pbuild.sh index 1c8e538..e2d79c1 100755 --- a/bin/pbuild.sh +++ b/bin/pbuild.sh @@ -313,7 +313,7 @@ do if [ -n "${TAG}" ] then - CONTROL="${REPOSITORY}/plain/debian/control?h=${TAG}" + CONTROL="${REPOSITORY}/plain/debian/control?h=$(echo ${TAG} | sed -e 's|+|%2b|g')" else CONTROL="${REPOSITORY}/plain/debian/control" fi diff --git a/bin/psign.sh b/bin/psign.sh index da59280..657af39 100755 --- a/bin/psign.sh +++ b/bin/psign.sh @@ -26,17 +26,17 @@ do case "${DISTRIBUTION}" in engywuck*) DESCRIPTION="Progress Linux 5 (engywuck) Archive Key" - KEY="0x03CED5154316222A" + KEY="E2DFE31B86A502DFC3B590B813AE95C933A667F4" ;; fuchur*) DESCRIPTION="Progress Linux 6 (fuchur) Archive Key" - KEY="0x753373FBB95C4EA6" + KEY="92F113D7A825A684D5E1F25AC15895BEAB2E96C5" ;; graograman*) DESCRIPTION="Progress Linux 7 (graograman) Archive Key" - KEY="0x7A8EB2C58FE6A7E6" + KEY="0650B427DE77D598819129B47A8EB2C58FE6A7E6" ;; *) @@ -76,17 +76,17 @@ do case "${DISTRIBUTION}" in engywuck*) DESCRIPTION="Progress Linux 5 (engywuck) Archive Key" - KEY="0x03CED5154316222A" + KEY="E2DFE31B86A502DFC3B590B813AE95C933A667F4" ;; fuchur*) DESCRIPTION="Progress Linux 6 (fuchur) Archive Key" - KEY="0x753373FBB95C4EA6" + KEY="92F113D7A825A684D5E1F25AC15895BEAB2E96C5" ;; graograman*) DESCRIPTION="Progress Linux 7 (graograman) Archive Key" - KEY="0x7A8EB2C58FE6A7E6" + KEY="0650B427DE77D598819129B47A8EB2C58FE6A7E6" ;; *) diff --git a/web/todo.sh b/web/todo.sh index 4d37c8d..a13058d 100755 --- a/web/todo.sh +++ b/web/todo.sh @@ -5,7 +5,7 @@ clear git clean -dxf > /dev/null 2>&1 || true ./update.engywuck -./update.engywuck-backports +#./update.engywuck-backports ./update.fuchur ./update.fuchur-backports @@ -17,13 +17,15 @@ MODE="$(basename ${0} | awk -F. '{ print $2 }')" case "${MODE}" in engywuck) - UPSTREAM_DISTRIBUTIONS="buster buster-updates buster-proposed-updates" + UPSTREAM_DISTRIBUTIONS="buster buster-security buster-updates buster-proposed-updates" DOWNSTREAM_DISTRIBUTION="engywuck" + DOWNSTREAM_DISTRIBUTIONS="engywuck engywuck-security engywuck-updates" DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" DOWNSTREAM_TAG="progress" ;; engywuck-backports) + # FIXME UPSTREAM_DISTRIBUTIONS="bullseye bullseye-updates bullseye-proposed-updates" DOWNSTREAM_DISTRIBUTION="engywuck-backports" DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" @@ -31,21 +33,23 @@ case "${MODE}" in ;; fuchur) - UPSTREAM_DISTRIBUTIONS="bullseye bullseye-updates bullseye-proposed-updates" + UPSTREAM_DISTRIBUTIONS="bullseye bullseye-security bullseye-updates bullseye-proposed-updates" DOWNSTREAM_DISTRIBUTION="fuchur" + DOWNSTREAM_DISTRIBUTIONS="fuchur fuchur-security fuchur-updates" DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" DOWNSTREAM_TAG="progress" ;; fuchur-backports) - UPSTREAM_DISTRIBUTIONS="bookworm" + UPSTREAM_DISTRIBUTIONS="bookworm bookworm-security bookworm-updates bookworm-proposed-updates" DOWNSTREAM_DISTRIBUTION="fuchur-backports" + DOWNSTREAM_DISTRIBUTIONS="fuchur-backports" DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" DOWNSTREAM_TAG="progress" ;; graograman) - UPSTREAM_DISTRIBUTIONS="bookworm bookworm-updates bookworm-proposed-updates" + UPSTREAM_DISTRIBUTIONS="bookworm bookworm-security bookworm-updates bookworm-proposed-updates" DOWNSTREAM_DISTRIBUTION="graograman" DOWNSTREAM_DISTRIBUTIONS="graograman graograman-security graograman-updates" DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" @@ -55,6 +59,7 @@ case "${MODE}" in graograman-backports) UPSTREAM_DISTRIBUTIONS="sid experimental" DOWNSTREAM_DISTRIBUTION="graograman-backports" + DOWNSTREAM_DISTRIBUTIONS="graograman-backports" DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" DOWNSTREAM_TAG="progress" ;; @@ -125,11 +130,8 @@ Download_upstream_indices () for DISTRIBUTION in ${UPSTREAM_DISTRIBUTIONS} do case "${DISTRIBUTION}" in - *-*) - ;; - - *) - if wget -q -O /dev/null "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/Release" + *-security) + if wget -q -O /dev/null "${UPSTREAM_MIRROR_SECURITY}/dists/$(echo ${DISTRIBUTION} | sed -e 's|-security||')/updates/Release" then for SECTION in ${UPSTREAM_SECTIONS} do @@ -139,13 +141,13 @@ Download_upstream_indices () case "${ARCHITECTURE}" in source) - wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources" + wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/$(echo ${DISTRIBUTION} | sed -e 's|-security||')/updates/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources" ;; *) - if wget -q -O /dev/null "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" + if wget -q -O /dev/null "${UPSTREAM_MIRROR_SECURITY}/dists/$(echo ${DISTRIBUTION} | sed -e 's|-security||')/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" then - wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries" + wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/$(echo ${DISTRIBUTION} | sed -e 's|-security||')/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries" fi ;; esac @@ -174,25 +176,27 @@ Download_upstream_indices () done fi ;; - esac - for SECTION in ${UPSTREAM_SECTIONS} - do - for ARCHITECTURE in ${ARCHITECTURES} - do - echo -n "." - - case "${ARCHITECTURE}" in - source) - wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources" - ;; - - *) - wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries" - ;; - esac - done - done + *) + for SECTION in ${UPSTREAM_SECTIONS} + do + for ARCHITECTURE in ${ARCHITECTURES} + do + echo -n "." + + case "${ARCHITECTURE}" in + source) + wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources" + ;; + + *) + wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries" + ;; + esac + done + done + ;; + esac done echo " done." diff --git a/web/update.FIXME b/web/update.FIXME deleted file mode 100755 index 9f8f2c3..0000000 --- a/web/update.FIXME +++ /dev/null @@ -1,271 +0,0 @@ -#!/bin/sh - -set -e - -RED="\033[1;33;31m" -GREEN="\033[1;33;32m" -YELLOW="\033[1;33;33m" -BLUE="\033[1;33;34m" -WHITE="\033[1;33;37m" -NORMAL="\033[0m" - -# FIXME: getopt -# FIXME: -f for forced indices download -# FIXME: download downstream binary index and check for architecture-missing-builds - -MODE="$(basename ${0} | awk -F. '{ print $2 }')" - -case "${MODE}" in - engywuck) - UPSTREAM_DISTRIBUTIONS="buster buster-updates buster-proposed-updates" - DOWNSTREAM_DISTRIBUTION="engywuck" - DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" - DOWNSTREAM_TAG="progress" - ;; - - engywuck-backports) - UPSTREAM_DISTRIBUTIONS="bullseye bullseye-updates bullseye-proposed-updates" - DOWNSTREAM_DISTRIBUTION="engywuck-backports" - DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" - DOWNSTREAM_TAG="progress" - ;; - - fuchur) - UPSTREAM_DISTRIBUTIONS="bullseye bullseye-updates bullseye-proposed-updates" - DOWNSTREAM_DISTRIBUTION="fuchur" - DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" - DOWNSTREAM_TAG="progress" - ;; - - fuchur-backports) - UPSTREAM_DISTRIBUTIONS="bookworm" - DOWNSTREAM_DISTRIBUTION="fuchur-backports" - DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" - DOWNSTREAM_TAG="progress" - ;; - - graograman) - UPSTREAM_DISTRIBUTIONS="bookworm bookworm-security" - DOWNSTREAM_DISTRIBUTION="graograman" - DOWNSTREAM_DISTRIBUTIONS="graograman graograman-security" - DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" - DOWNSTREAM_TAG="progress" - ;; - - graograman-backports) - UPSTREAM_DISTRIBUTIONS="sid experimental" - DOWNSTREAM_DISTRIBUTION="graograman-backports" - DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages" - DOWNSTREAM_TAG="progress" - ;; - - buster) - UPSTREAM_DISTRIBUTIONS="buster buster-updates buster-proposed-updates" - DOWNSTREAM_DISTRIBUTION="buster" - DOWNSTREAM_MIRROR="https://apt.bfh.science/packages" - DOWNSTREAM_TAG="bfh" - ;; - - buster-backports) - UPSTREAM_DISTRIBUTIONS="sid experimental" - DOWNSTREAM_DISTRIBUTION="buster-backports" - DOWNSTREAM_MIRROR="https://apt.bfh.science/packages" - DOWNSTREAM_TAG="bfh" - ;; -esac - -UPSTREAM_SECTIONS="main contrib non-free" -UPSTREAM_MIRROR="http://debian.ethz.ch/debian" - -DOWNSTREAM_SECTIONS="main contrib non-free" - -#ARCHITECTURES="amd64 armel armhf arm64 i386 all source" -ARCHITECTURES="amd64 arm64 all source" - -Download_downstream_indices () -{ - # Download downstream indices -# if [ -e "downstream.${MODE}.sources" ] && [ "$(( $(stat -c %Y downstream.${MODE}.sources) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ] -# then -# # file is older than 4 hours - rm -f "downstream.${MODE}.sources" -# fi - - if [ ! -e "downstream.${MODE}.sources" ] - then - for DISTRIBUTION in ${DOWNSTREAM_DISTRIBUTIONS} - do - for SECTION in ${DOWNSTREAM_SECTIONS} - do - wget -q -O - "${DOWNSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "downstream.${MODE}.sources" - done - done - fi -} - -Download_upstream_indices () -{ - # Download upstream indices -# if [ -e "upstream.${MODE}.sources" ] && [ "$(( $(stat -c %Y upstream.${MODE}.sources) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ] -# then -# # file is older than 4 hours - rm -f "upstream.${MODE}.sources" -# fi - -# if [ -e "upstream.${MODE}.binaries" ] && [ "$(( $(stat -c %Y upstream.${MODE}.binaries) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ] -# then -# # file is older than 4 hours - rm -f "upstream.${MODE}.binaries" -# fi - -# if [ ! -e "upstream.${MODE}.indices" ] -# then - echo -n "Downloading indices... " - - for DISTRIBUTION in ${UPSTREAM_DISTRIBUTIONS} - do - case "${DISTRIBUTION}" in - *-security) - if wget -q -O /dev/null "http://security.debian.org/dists/${DISTRIBUTION}/Release" - then - for SECTION in ${UPSTREAM_SECTIONS} - do - for ARCHITECTURE in ${ARCHITECTURES} - do - echo -n "." - - case "${ARCHITECTURE}" in - source) - wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources" - ;; - - *) - wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries" - ;; - esac - done - done - elif wget -q -O /dev/null "http://security.debian.org/dists/${DISTRIBUTION}/updates/Release" - then - for SECTION in ${UPSTREAM_SECTIONS} - do - for ARCHITECTURE in ${ARCHITECTURES} - do - echo -n "." - - case "${ARCHITECTURE}" in - source) - wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources" - ;; - - *) - if wget -q -O /dev/null "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" - then - wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries" - fi - ;; - esac - done - done - fi - - continue - ;; - - *-*) - ;; - esac - - for SECTION in ${UPSTREAM_SECTIONS} - do - for ARCHITECTURE in ${ARCHITECTURES} - do - echo -n "." - - case "${ARCHITECTURE}" in - source) - wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources" - ;; - - *) - wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries" - ;; - esac - done - done - done - - echo " done." -# fi -} - -Download_downstream_indices -Download_upstream_indices - -# Process downstream indices -DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.sources | sort -u)" - -echo "################################################################################" -echo "${DOWNSTREAM_DISTRIBUTION}" -echo "################################################################################" - -echo -n "Comparing versions... " - -for PACKAGE in ${DOWNSTREAM_PACKAGES} -do - DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.sources | awk '/^Version: / { print $2 }')" - - case "${MODE}" in - *-backports) - # ignore BinNMUs - UPSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" upstream.${MODE}.sources | awk '/^Version: / { print $2 }' | sort -rV | head -n1)" - ;; - - *) - # upstream_source_version = highest version of (upstream_source_versions + upstream_binary_versions) - UPSTREAM_VERSION="$(grep -A2 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | awk '/^Version: / { print $2 }') $(for BINARY in $(grep -A1 "^Package: ${PACKAGE}\$" upstream.${MODE}.sources | grep '^Binary:' | cut -d: -f 2- | sed -e 's|,||g'); do grep -A2 "^Package: ${BINARY}\$" upstream.${MODE}.binaries ; done | awk '/^Version: / { print $2 }')" - UPSTREAM_VERSION="$(echo ${UPSTREAM_VERSION} | sed -e 's| |\n|g' | sort -rV | head -n1)" - ;; - esac - - if echo ${UPSTREAM_VERSION} | grep -qs '-' - then - # package is non-native - DOWNSTREAM="$(echo ${DOWNSTREAM_VERSION} | sed -e "s|~${DOWNSTREAM_TAG}.*||" -e "s|${DOWNSTREAM_TAG}.*||")" - else - # package is native - DOWNSTREAM="$(echo ${DOWNSTREAM_VERSION} | sed -e "s|-0.0~${DOWNSTREAM_TAG}.*||" -e "s|-0.*${DOWNSTREAM_TAG}.*||")" - fi - - if grep -qs "^${PACKAGE} ${UPSTREAM_VERSION}$" ignore.txt - then - continue - fi - - if [ -z "${UPSTREAM_VERSION}" ] && grep -qs "^${PACKAGE} ${DOWNSTREAM_VERSION}$" ignore.txt - then - continue - fi - - if [ -z "${UPSTREAM_VERSION}" ] - then - echo " ${BLUE}${PACKAGE}${NORMAL} (!${DOWNSTREAM_VERSION})" - continue - fi - - # comparing versions - if dpkg --compare-versions ${UPSTREAM_VERSION} eq ${DOWNSTREAM} - then - echo -n "." - elif dpkg --compare-versions ${UPSTREAM_VERSION} gt ${DOWNSTREAM} - then - echo " ${RED}${PACKAGE}${NORMAL} (${UPSTREAM_VERSION} >> ${DOWNSTREAM_VERSION})" - elif dpkg --compare-versions ${UPSTREAM_VERSION} lt ${DOWNSTREAM} - then - echo " ${YELLOW}${PACKAGE}${NORMAL} (${UPSTREAM_VERSION} << ${DOWNSTREAM_VERSION})" - else - echo " ${PACKAGE}: internal error" - fi -done - -echo " done." |