Updating.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 235 insertions, 15 deletions

diff --git a/bin/debian-chroot b/bin/debian-chroot
index 3aaf7b8..c783bb2 100755
--- a/bin/debian-chroot
+++ b/bin/debian-chroot
@@ -27,6 +27,10 @@ case "${DISTRIBUTION}" in
 	bullseye*)
 		DERIVATIVE_DISTRIBUTION="fuchur"
 		;;
+
+	bookworm*)
+		DERIVATIVE_DISTRIBUTION="graograman"
+		;;
 esac
 
 MIRROR="debian.ethz.ch"
@@ -197,36 +201,69 @@ EOF
 
 		case "${BASH_HISTORY}" in
 			arch)
-
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
-
+						;;
+				esac
 				;;
 
 			indep)
 
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
-clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION} -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
+						;;
 
+					*)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+				esac
 				;;
 
 			source)
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
 
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
-
+						;;
+				esac
 				;;
 		esac
 
@@ -288,35 +325,68 @@ EOF
 
 		case "${BASH_HISTORY}" in
 			arch)
-
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
-
+						;;
+				esac
 				;;
 
 			indep)
 
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
-clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION} -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
+						;;
 
+					*)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+				esac
 				;;
 
 			source)
-
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
+						;;
+				esac
 				;;
 		esac
 
diff --git a/bin/git-debian-changelog b/bin/git-debian-changelog
index 2197979..c514cf9 100755
--- a/bin/git-debian-changelog
+++ b/bin/git-debian-changelog
@@ -128,6 +128,34 @@ then
 							;;
 					esac
 					;;
+
+				graograman)
+					case "${VERSION}" in
+						*-*)
+							# non-native
+							VERSION="--dch-opt=-b -N ${VERSION}progress7u1"
+							;;
+
+						*)
+							# native
+							VERSION="--dch-opt=-b -N ${VERSION}-0progress7u1"
+							;;
+					esac
+					;;
+
+				graograman-backports)
+					case "${VERSION}" in
+						*-*)
+							# non-native
+							VERSION="--dch-opt=-b -N ${VERSION}~progress7+u1"
+							;;
+
+						*)
+							# native
+							VERSION="--dch-opt=-b -N ${VERSION}-0.0~progress7+u1"
+							;;
+					esac
+					;;
 			esac
 			;;
 	esac
diff --git a/bin/pbuild.sh b/bin/pbuild.sh
index 49c5242..1df64f5 100755
--- a/bin/pbuild.sh
+++ b/bin/pbuild.sh
@@ -198,6 +198,10 @@ do
 		case "${ONLY_MISSING_BUILDS}" in
 			true)
 				case "${BUILD}" in
+					binary-indep)
+						URL="https://apt.progress-linux.org/archive/${DISTRIBUTION}/${PACKAGE}/${VERSION}_all"
+						;;
+
 					source)
 						URL="https://apt.progress-linux.org/archive/${DISTRIBUTION}/${PACKAGE}/${VERSION}_source"
 						;;
@@ -252,7 +256,7 @@ do
 
 				mv "${TARGET}" "${TARGET}-${UPSTREAM_VERSION}"
 
-				for DIST in engywuck fuchur
+				for DIST in engywuck fuchur graograman
 				do
 					if [ ! -e "${TARGET}_${UPSTREAM_VERSION}.orig.tar.xz" ]
 					then
diff --git a/bin/pimport.sh b/bin/pimport.sh
index b72bc5c..573789e 100755
--- a/bin/pimport.sh
+++ b/bin/pimport.sh
@@ -34,6 +34,10 @@ case "${MODE}" in
 		then
 			VCS_BROWSER="https://git.progress-linux.org/packages/fuchur-backports"
 			VCS_GIT="https://git.progress-linux.org/packages/fuchur-backports"
+		elif echo ${PWD} | grep -qs graograman-backports
+		then
+			VCS_BROWSER="https://git.progress-linux.org/packages/graograman-backports"
+			VCS_GIT="https://git.progress-linux.org/packages/graograman-backports"
 		elif echo ${PWD} | grep -qs engywuck
 		then
 			VCS_BROWSER="https://git.progress-linux.org/packages/engywuck"
@@ -42,9 +46,13 @@ case "${MODE}" in
 		then
 			VCS_BROWSER="https://git.progress-linux.org/packages/fuchur"
 			VCS_GIT="https://git.progress-linux.org/packages/fuchur"
+		elif echo ${PWD} | grep -qs graograman
+		then
+			VCS_BROWSER="https://git.progress-linux.org/packages/graograman"
+			VCS_GIT="https://git.progress-linux.org/packages/graograman"
 		else
-			VCS_BROWSER="https://git.progress-linux.org/packages/engywuck-backports"
-			VCS_GIT="https://git.progress-linux.org/packages/engywuck-backports"
+			echo "NO VCS detection"
+			exit 1
 		fi
 
 		DOWNSTREAM_BRANCH="progress-linux"
diff --git a/bin/psign.sh b/bin/psign.sh
index 7762087..f3353c7 100755
--- a/bin/psign.sh
+++ b/bin/psign.sh
@@ -36,7 +36,7 @@ do
 
 				graograman*)
 					DESCRIPTION="Progress Linux 7 (graograman) Archive Key"
-					KEY=""
+					KEY="0x076B33250B5DD18B"
 					;;
 
 				*)
@@ -86,7 +86,7 @@ do
 
 				graograman*)
 					DESCRIPTION="Progress Linux 7 (graograman) Archive Key"
-					KEY=""
+					KEY="0x076B33250B5DD18B"
 					;;
 
 				*)
diff --git a/bin/pupdate.sh b/bin/pupdate.sh
index 1ed020f..da3bc23 100755
--- a/bin/pupdate.sh
+++ b/bin/pupdate.sh
@@ -208,7 +208,7 @@ Switch_downstream_branch ()
 
 Merge_upstream_version ()
 {
-	git cherry-pick -n upstream
+	git cherry-pick -n --allow-empty upstream
 	git commit -a -s -S -m "Merging upstream version ${DEB_UPSTREAM_VERSION}."
 }
 
diff --git a/web/FIXME_BINMUs b/web/FIXME_BINMUs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/web/FIXME_BINMUs
diff --git a/web/hint-packages.sh b/web/hint-packages.sh
new file mode 100755
index 0000000..ef76ebf
--- /dev/null
+++ b/web/hint-packages.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+set -e
+
+for CODENAMES in \
+	engywuck_fuchur \
+	engywuck-backports_fuchur-backports \
+	fuchur_engywuck \
+	fuchur-backports_engywuck-backports \
+	graograman_fuchur
+	#graograman-backports_fuchur-backports
+do
+	TARGET="$(echo ${CODENAMES} | awk -F_ '{ print $1 }')"
+	SOURCE="$(echo ${CODENAMES} | awk -F_ '{ print $2 }')"
+
+	echo "###############################################################################"
+	echo "${TARGET} hints"
+	echo "###############################################################################"
+
+	cd "/srv/git/progress-linux.org/packages/${SOURCE}"
+
+	for PACKAGE in $(ls -d */)
+	do
+		PACKAGE="$(basename ${PACKAGE})"
+
+		if [ ! -e "../${TARGET}/${PACKAGE}" ]
+		then
+			case "${TARGET}" in
+				engywuck)
+					case "${PACKAGE}" in
+						browserpass)
+							# no modification in the newer package in the old distribution required - ignore
+							continue
+							;;
+
+						progress-linux-metapackages)
+							# package already included in engywuck-backports
+							continue
+							;;
+					esac
+					;;
+
+				engywuck-backports)
+					case "${PACKAGE}" in
+						pass-tomb|password-store)
+							# no modification in the newer package in the old distribution required - ignore
+							continue
+							;;
+
+						dnsperf|icingaweb2-module-generictts|icingaweb2-module-graphite|icingaweb2-module-idoreports|icingaweb2-module-incubator|icingaweb2-module-metapackages|icingaweb2-module-reporting|icingaweb2-module-toplevelview|icingaweb2-module-x509|iredis|litecli|monitoring-plugins-systemd|pgcli|postgresql-14|ptpython)
+							# package not in debian bullseye - ignore
+							continue
+							;;
+
+						ck|libgcrypt20|cli-helpers|libgpg-error|llvm-toolchain-12|llvm-toolchain-13|pendulum|pytzdata)
+							# build-depends of package not in debian bullseye - ignore
+							continue
+							;;
+					esac
+					;;
+
+				fuchur)
+					case "${PACKAGE}" in
+						mdadm|mycli)
+							# no modification in the newer package in the old distribution required - ignore
+							continue
+							;;
+
+						linux-latest|mariadb-10.3|postgresql-11)
+							# package not in debian bullseye - ignore
+							continue
+							;;
+					esac
+					;;
+			esac
+
+			echo "${TARGET}: ${PACKAGE}"
+		fi
+	done
+
+	echo
+done
diff --git a/web/todo.sh b/web/todo.sh
index 4c5b675..4d37c8d 100755
--- a/web/todo.sh
+++ b/web/todo.sh
@@ -2,10 +2,13 @@
 
 clear
 
-git clean -dxf
+git clean -dxf > /dev/null 2>&1 || true
 
 ./update.engywuck
 ./update.engywuck-backports
 
 ./update.fuchur
 ./update.fuchur-backports
+
+./update.graograman
+./update.graograman-backports
diff --git a/web/update b/web/update
index a73d6a9..20758ae 100755
--- a/web/update
+++ b/web/update
@@ -43,6 +43,21 @@ case "${MODE}" in
 		DOWNSTREAM_TAG="progress"
 		;;
 
+	graograman)
+		#UPSTREAM_DISTRIBUTIONS="bookworm bookworm-updates bookworm-proposed-updates"
+		UPSTREAM_DISTRIBUTIONS="sid experimental"
+		DOWNSTREAM_DISTRIBUTION="graograman"
+		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"
@@ -106,6 +121,14 @@ Download_upstream_sources ()
 							wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
 						done
 					fi
+
+					if wget -q -O /dev/null "http://security.debian.org/dists/${DISTRIBUTION}-security/Release"
+					then
+						for SECTION in ${UPSTREAM_SECTIONS}
+						do
+							wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}-security/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
+						done
+					fi
 					;;
 			esac
 
diff --git a/web/update.graograman b/web/update.graograman
new file mode 120000
index 0000000..77c430a
--- /dev/null
+++ b/web/update.graograman
@@ -0,0 +1 @@
+update
\ No newline at end of file
diff --git a/web/update.graograman-backports b/web/update.graograman-backports
new file mode 120000
index 0000000..77c430a
--- /dev/null
+++ b/web/update.graograman-backports
@@ -0,0 +1 @@
+update
\ No newline at end of file