summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README15
-rwxr-xr-xbackport4
-rwxr-xr-xbackport_others4
-rwxr-xr-xbuild2
-rwxr-xr-xclean4
-rw-r--r--jessie/_reverts_lattice.sh2
-rw-r--r--jessie/_reverts_r-base.sh2
-rwxr-xr-xmove_debs4
-rw-r--r--stretch/_reverts_r-base.sh3
-rw-r--r--wheezy/TALOS-2016-0227.patch35
-rw-r--r--wheezy/_reverts_jags.sh3
-rw-r--r--wheezy/_reverts_r-base.sh2
-rw-r--r--wheezy/_reverts_r-cran-rjags.sh4
13 files changed, 21 insertions, 63 deletions
diff --git a/README b/README
index 58e26af..a069236 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ Currently I am using the following setup:
BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
MIRRORSITE="http://ftp.de.debian.org/debian/"
- OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://ftp.de.debian.org/debian $DIST-backports main|deb http://localhost/r-cran $DIST-cran35/"
+ OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://ftp.de.debian.org/debian $DIST-backports main|deb http://localhost/r-cran $DIST-cran40/"
COMPONENTS="main"
This means I have the appropriate aptcache and buildresult directories set up
@@ -56,11 +56,20 @@ Then I add a new entry in /etc/schroot/schroot.conf like
profile=default
directory=/var/chroot/bullseye-amd64
-and use sudo schroot -c bullseye64 to enter it. Within the chroot I install vim
-and add the matching local r-cran repository to /etc/apt/sources.list like
+and use sudo schroot -c bullseye64 to enter it. Within the chroot I install
+some necessary or useful stuff
+
+ apt install vim gnupg build-essential devscripts
+
+add the matching local r-cran repository to /etc/apt/sources.list like
deb http://localhost/r-cran bullseye-cran40/
deb-src http://localhost/r-cran bullseye-cran40/
+and tell apt to trust my key (from my Debian CRAN page):
+
+ gpg --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'
+ gpg --armor --export '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7' > /etc/apt/trusted.gpg.d/cran_debian_key.asc
+
In the chroot, build-essential and devscripts have to be installed
diff --git a/backport b/backport
index 258dd6e..ed2f96c 100755
--- a/backport
+++ b/backport
@@ -22,7 +22,7 @@ rcrandir=/home/jranke/git/uni-bremen/website/www/ranke/r-cran
usage()
{
-echo "Usage: ./backport [options] sourcepackage stretch|buster|bullseye"
+echo "Usage: ./backport [options] sourcepackage buster|bullseye|bookworm"
echo "Options:"
echo " -k, --keep Keep copied source package and directory used for package building"
echo " -s, --skip Skip apt-get update/upgrade and pbuilder update"
@@ -58,7 +58,7 @@ pkg=$1
DIST=$2
# Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
export DIST
# Remove previously extracted sources
diff --git a/backport_others b/backport_others
index dacac7a..921ccf6 100755
--- a/backport_others
+++ b/backport_others
@@ -11,7 +11,7 @@ export ARCH
usage()
{
-echo "Usage: ./backport_others [options] stretch|buster|bullseye"
+echo "Usage: ./backport_others [options] buster|bullseye|bookworm"
echo "Options:"
echo " -s Skip apt-get update/upgrade and pbuilder update"
}
@@ -51,7 +51,7 @@ then
fi
# Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
export DIST
# When doing a new repository, do lattice, r-cran-mass
diff --git a/build b/build
index 439eabb..95b2b84 100755
--- a/build
+++ b/build
@@ -54,7 +54,7 @@ then
apt-get upgrade
fi
-# stretch needs --only-source (at least for rkward source packages)
+# stretch needed --only-source (at least for rkward source packages)
apt --only-source build-dep $pkg
apt --only-source source $pkg
diff --git a/clean b/clean
index a2d5acb..ba43d85 100755
--- a/clean
+++ b/clean
@@ -4,14 +4,14 @@
usage()
{
-echo "Usage: ./clean [stretch|buster|bullseye]"
+echo "Usage: ./clean [buster|bullseye|bookworm]"
}
if [ $# -gt 1 ]; then usage; exit 1; fi
if [ $# -eq 1 ]
then
DIST=$1
- if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+ if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
cd $DIST
fi
diff --git a/jessie/_reverts_lattice.sh b/jessie/_reverts_lattice.sh
deleted file mode 100644
index 21f22e6..0000000
--- a/jessie/_reverts_lattice.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ssed -i -R "/^Build-Depends/s/debhelper \(>= 11\)/debhelper (>= 10)/" debian/control
-dch -a "debian/control: Require debhelper >=10 instead of >=11"
diff --git a/jessie/_reverts_r-base.sh b/jessie/_reverts_r-base.sh
deleted file mode 100644
index 2f15316..0000000
--- a/jessie/_reverts_r-base.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-rm debian/r-base-core.maintscript
-dch -a "debian/r-base-core.maintscript: Remove maintscript as it causes trouble upgrading r-base-core from jessie"
diff --git a/move_debs b/move_debs
index 4dba960..17e9a50 100755
--- a/move_debs
+++ b/move_debs
@@ -4,7 +4,7 @@
usage()
{
-echo "Usage: ./move_debs stretch|buster|bullseye"
+echo "Usage: ./move_debs buster|bullseye|bookworm"
}
# Positional argument
@@ -12,7 +12,7 @@ if [ $# -lt 1 ]; then usage; exit 1; fi
DIST=$1
# Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
sudo chown jranke $DIST/*${DIST}cran*_amd64.{deb,build}
mv -v $DIST/*${DIST}cran*_amd64.{deb,build} /home/jranke/git/uni-bremen/website/www/ranke/r-cran/$DIST-cran40
diff --git a/stretch/_reverts_r-base.sh b/stretch/_reverts_r-base.sh
deleted file mode 100644
index 7f9a6de..0000000
--- a/stretch/_reverts_r-base.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-ssed -i -R "/^Build-Depends/s/texlive-plain-generic/texlive-generic-recommended/" debian/control
-ssed -i -R "/^Suggests/s/texlive-plain-generic/texlive-generic-recommended/" debian/control
-dch -a "debian/control: Revert Build-Depends: from texlive-plain-generic to texlive-generic-recommended"
diff --git a/wheezy/TALOS-2016-0227.patch b/wheezy/TALOS-2016-0227.patch
deleted file mode 100644
index f7bc97e..0000000
--- a/wheezy/TALOS-2016-0227.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: src/library/grDevices/src/devPS.c
-===================================================================
---- src/library/grDevices/src/devPS.c (Revision 71663)
-+++ src/library/grDevices/src/devPS.c (Revision 71664)
-@@ -513,13 +513,15 @@
- if (!(fp = R_fopen(R_ExpandFileName(buf), "r"))) return 0;
- }
- if (GetNextItem(fp, buf, -1, &state)) return 0; /* encoding name */
-- strcpy(encname, buf+1);
-+ strncpy(encname, buf+1, 99);
-+ encname[99] = '\0';
- if (!isPDF) snprintf(enccode, 5000, "/%s [\n", encname);
- else enccode[0] = '\0';
- if (GetNextItem(fp, buf, 0, &state)) { fclose(fp); return 0;} /* [ */
- for(i = 0; i < 256; i++) {
- if (GetNextItem(fp, buf, i, &state)) { fclose(fp); return 0; }
-- strcpy(encnames[i].cname, buf+1);
-+ strncpy(encnames[i].cname, buf+1, 39);
-+ encnames[i].cname[39] = '\0';
- strcat(enccode, " /"); strcat(enccode, encnames[i].cname);
- if(i%8 == 7) strcat(enccode, "\n");
- }
-Index: src/library/grDevices/src/devPS.c
-===================================================================
---- src/library/grDevices/src/devPS.c (Revision 71666)
-+++ src/library/grDevices/src/devPS.c (Revision 71667)
-@@ -521,7 +521,7 @@
- for(i = 0; i < 256; i++) {
- if (GetNextItem(fp, buf, i, &state)) { fclose(fp); return 0; }
- strncpy(encnames[i].cname, buf+1, 39);
-- encnames[i].cname[39] = '\0';
-+ encnames[i].cname[39] = '\0';
- strcat(enccode, " /"); strcat(enccode, encnames[i].cname);
- if(i%8 == 7) strcat(enccode, "\n");
- }
diff --git a/wheezy/_reverts_jags.sh b/wheezy/_reverts_jags.sh
deleted file mode 100644
index 97a5bd1..0000000
--- a/wheezy/_reverts_jags.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-ssed -i -R "/^Build-Depends/s/gfortran \(.*\)/gfortran/" debian/control
-ssed -i -R "/^Build-Depends/s/g++ \(.*\)/g++/" debian/control
-dch -a "debian/control: remove version requirements for gfortran and g++"
diff --git a/wheezy/_reverts_r-base.sh b/wheezy/_reverts_r-base.sh
deleted file mode 100644
index df47c30..0000000
--- a/wheezy/_reverts_r-base.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-patch -p0 < ../TALOS-2016-0227.patch
-dch -a "debian/control: Apply upstream commits r71664 and r71667 related to CVE-2016-8714 reported as TALOS-2016-0227"
diff --git a/wheezy/_reverts_r-cran-rjags.sh b/wheezy/_reverts_r-cran-rjags.sh
deleted file mode 100644
index e7fc882..0000000
--- a/wheezy/_reverts_r-cran-rjags.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Lower dependencies for jags
-ssed -i -R "/^Build-Depends/s/jags \(>= .*?\)/jags (>= 4.0)/" debian/control
-ssed -i -R "/^Depends/s/jags \(>= .*?\)/jags (>= 4.0)/" debian/control
-dch -a "debian/control: Lower (build) dependency on jags to be satisfied by backport"

Contact - Imprint