From 6c3cbeca7541e0869f418801689e275ebe7c9e96 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 16 Jun 2018 08:01:44 +0900 Subject: ready for 2018 --- tl-sign-file | 24 ------------------------ tlpkg/texlive.tlpdb | 8 +++----- tlpkg/tlpsrc/00texlive.config.tlpsrc | 2 +- update.sh | 4 +++- 4 files changed, 7 insertions(+), 31 deletions(-) delete mode 100755 tl-sign-file diff --git a/tl-sign-file b/tl-sign-file deleted file mode 100755 index 2d54a52..0000000 --- a/tl-sign-file +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# $Id$ -# Public domain. Originally written 2016, Norbert Preining -# Sign a file for release in TeX Live - -if test $# -ne 1; then - echo "$0: Exactly one argument must be given, the file to sign." >&2 - exit 1 -fi - -# remove previous signature -rm -f "$1.asc" - -prg=gpg -if ! [ "x$TL_GNUPG" = "x" ] ; then - # use the environment variable TL_GNUPG - prg=$TL_GNUPG -fi - -# sign -$prg --armor \ - --detach-sign \ - --local-user 0xEC00B8DAD32266AA \ - "$1" diff --git a/tlpkg/texlive.tlpdb b/tlpkg/texlive.tlpdb index 76232a9..1702e85 100644 --- a/tlpkg/texlive.tlpdb +++ b/tlpkg/texlive.tlpdb @@ -2,14 +2,12 @@ name 00texlive.config category TLCore revision 1 depend container_format/xz -depend release/2017-gpg -depend minrelease/2016 -depend container_format/xz depend container_split_doc_files/1 depend container_split_src_files/1 +depend frozen/0 depend minrelease/2016 -depend release/2017 -depend revision/4 +depend release/2018-gpg +depend revision/6 name 00texlive.installation category TLCore diff --git a/tlpkg/tlpsrc/00texlive.config.tlpsrc b/tlpkg/tlpsrc/00texlive.config.tlpsrc index f9e897b..1fa1f66 100644 --- a/tlpkg/tlpsrc/00texlive.config.tlpsrc +++ b/tlpkg/tlpsrc/00texlive.config.tlpsrc @@ -1,4 +1,4 @@ category TLCore depend container_format/xz -depend release/2017-gpg +depend release/2018-gpg depend minrelease/2016 diff --git a/update.sh b/update.sh index daa82a6..ead29ba 100644 --- a/update.sh +++ b/update.sh @@ -14,6 +14,9 @@ TLCHECKOUT=${TLCHECKOUT:-/home/norbert/Development/TeX/texlive.git} TLNETDEST=${TLNETDEST:-/home/norbert/Domains/server/preining.info/www/tlgpg} +# how to sign +export TL_GNUPGOPTS="--local-user 0xEC00B8DAD32266AA" + # we don't do TeX Catalogue updates unset TEX_CATALOGUE @@ -25,7 +28,6 @@ $TLCHECKOUT/Master/tlpkg/bin/tl-update-tlpdb \ $TLCHECKOUT/Master/tlpkg/bin/tl-update-containers \ -master `pwd` \ -location $TLNETDEST \ - -gpgcmd `pwd`/tl-sign-file \ -all # -recreate # sometimes -recreate might be necessary to fully rebuild! -- cgit v1.2.3