From 5f34ffb6c6ab78ec679c5f7bda7f1c16d7613b98 Mon Sep 17 00:00:00 2001 From: Uxorious Date: Sat, 1 Nov 2014 20:33:34 -0700 Subject: [PATCH 1/3] The script is failing for me because the Debian packaging scripts are also trying to download the packages. This obviously used to work, but aparently the servers no linger support resume. Since the packages are already being downloaded by the script, the easiest fix is just to remove the Debian packaging command that downloads the packages. --- oab-java.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oab-java.sh b/oab-java.sh index d6ed97e..cfc148a 100755 --- a/oab-java.sh +++ b/oab-java.sh @@ -470,6 +470,9 @@ cd ${WORK_PATH}/ >> "$log" 2>&1 git clone -b ${TAG} ${WORK_PATH}/srcs/${JAVA_UPSTREAM}.git src >> "$log" 2>&1 & pid=$!;progress $pid +# Change prepare.sh to not download the files as we will do it here. +sed -i '/^make.*get-orig-source$/d' src/prepare.sh + # Cet the current Debian package version and package urgency DEB_VERSION=`head -n1 ${WORK_PATH}/src/debian/changelog | cut -d'(' -f2 | cut -d')' -f1 | cut -d'~' -f1` DEB_URGENCY=`head -n1 ${WORK_PATH}/src/debian/changelog | cut -d'=' -f2` From 1b9f68897ec28ef7a9519543c24251974cd9590a Mon Sep 17 00:00:00 2001 From: Uxorious Date: Mon, 9 May 2016 12:00:12 -0700 Subject: [PATCH 2/3] Changed Release digest to use SHA512 (Ubuntu 16.04 no longer allows MD5). --- oab-java.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oab-java.sh b/oab-java.sh index cfc148a..394c493 100755 --- a/oab-java.sh +++ b/oab-java.sh @@ -659,10 +659,10 @@ echo "Date: `date -R`" >> Release echo "Architectures: ${LSB_ARCH}" >> Release echo "Components: restricted" >> Release echo "Description: Local Java Repository" >> Release -echo "MD5Sum:" >> Release +echo "SHA512:" >> Release for PACKAGE in Packages* do - printf ' '`md5sum ${PACKAGE} | cut -d' ' -f1`" %16d ${PACKAGE}\n" `wc --bytes ${PACKAGE} | cut -d' ' -f1` >> Release + printf ' '`sha512sum ${PACKAGE} | cut -d' ' -f1`" %16d ${PACKAGE}\n" `wc --bytes ${PACKAGE} | cut -d' ' -f1` >> Release done cecho success From 201d125e2235b5dba595c02f2767c3129d1a5924 Mon Sep 17 00:00:00 2001 From: Uxorious Date: Fri, 13 May 2016 14:36:00 -0700 Subject: [PATCH 3/3] Changed package signature to use SHA512 as Ubuntu 16.04 warns about SHA1. --- oab-java.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oab-java.sh b/oab-java.sh index 394c493..d777299 100755 --- a/oab-java.sh +++ b/oab-java.sh @@ -714,7 +714,7 @@ if [ -n "${BUILD_KEY}" ] || [ -e ${WORK_PATH}/gpg/pubring.gpg ] && [ -e ${WORK_P else GPG_OPTION=(--homedir ${WORK_PATH}/gpg) fi - gpg "${GPG_OPTION[@]}" --armor --detach-sign --output ${WORK_PATH}/deb/Release.gpg ${WORK_PATH}/deb/Release >> "$log" 2>&1 & + gpg "${GPG_OPTION[@]}" --digest-algo SHA512 --armor --detach-sign --output ${WORK_PATH}/deb/Release.gpg ${WORK_PATH}/deb/Release >> "$log" 2>&1 & pid=$!;progress $pid if [ -z "${BUILD_KEY}" ] ; then