From 68fdb98eb9ad5c123cb64e3b2f3057b8a0946b89 Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Tue, 25 Nov 2014 16:21:22 +0100 Subject: [PATCH 01/10] Use local apt config, so helpers can be run as user --- helpers/config | 89 +++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/helpers/config b/helpers/config index 4ab62cf..9caad0d 100755 --- a/helpers/config +++ b/helpers/config @@ -18,29 +18,20 @@ # set -e - +export LANG=C PACKAGE=$(echo $0 |/bin/sed s/make-//g) + + +export DATE=$(date +'%a, %d %b %Y %T %z') + export DATA=$PWD/DATA/$PACKAGE if ! [ 1$COMPONENT = "1main" ] then COMPONENT=${COMPONENT:-universe} - /bin/sed 's/^enable.*/enable: false/g' -i /etc/pkgbinarymangler/*.conf -fi - -if [ -f /CurrentlyBuilding ] -then - echo "Already running $(cat /CurrentlyBuilding)" - echo "If $(cat /CurrentlyBuilding) broke and nothing is actually running" - echo "remove /CurrentlyBuilding and run this script again" - exit 1 -else - echo "Package: $PACKAGE -Component: $COMPONENT" > /CurrentlyBuilding + export NO_PKG_MANGLE=1 fi [ -d PACKAGES ] || mkdir PACKAGES -[ -d /proc/sys ] || mount proc /proc -t proc -hostname devel.trisquel.info export DEBIAN_FRONTEND=noninteractive export DEBEMAIL=trisquel-devel@listas.trisquel.info @@ -54,13 +45,7 @@ export UPSTREAMRELEASE=14.04 MIRROR=http://archive.ubuntu.com/ubuntu DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME LOCALMIRROR=http://archive.trisquel.info/trisquel - -cat << EOF > /etc/lsb-release -DISTRIB_ID=Trisquel -DISTRIB_RELEASE=$REVISION -DISTRIB_CODENAME=$CODENAME -DISTRIB_DESCRIPTION="Trisquel $REVISION" -EOF +LOCAL_APT=`mktemp -d` replace(){ find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i s^"$1"^"$2"^g {} \; @@ -76,7 +61,32 @@ rm -rf PACKAGES/$PACKAGE mkdir PACKAGES/$PACKAGE cd PACKAGES/$PACKAGE -cat << EOF > /etc/apt/sources.list + +#Setup local apt + +trap "rm -rf ${LOCAL_APT}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM + +mkdir -p ${LOCAL_APT}/var/lib/apt/partial +mkdir -p ${LOCAL_APT}/var/cache/apt/archives/partial +mkdir -p ${LOCAL_APT}/etc/ +mkdir -p ${LOCAL_APT}/var/lib/dpkg +touch ${LOCAL_APT}/var/lib/dpkg/status +cp /etc/apt/trusted.gpg ${LOCAL_APT}/etc/trusted.gpg + +cat << EOF > ${LOCAL_APT}/etc/apt.conf +Dir::State "${LOCAL_APT}/var/lib/apt"; +Dir::State::status "${LOCAL_APT}/var/lib/dpkg/status"; +Dir::Etc::SourceList "${LOCAL_APT}/etc/apt.sources.list"; +Dir::Cache "${LOCAL_APT}/var/cache/apt"; +pkgCacheGen::Essential "none"; +Dir::Etc::Trusted "${LOCAL_APT}/etc/trusted.gpg"; +EOF + +apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 +apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 + + +cat << EOF > ${LOCAL_APT}/etc/apt.sources.list deb $MIRROR $UPSTREAM main universe deb $MIRROR $UPSTREAM-updates main universe deb $MIRROR $UPSTREAM-security main universe @@ -92,11 +102,11 @@ deb $DEVELMIRROR $CODENAME main #deb-src $DEVELMIRROR $CODENAME main EOF -[ "1$EXTERNAL" != "1" ] && eval echo "$EXTERNAL" >> /etc/apt/sources.list -[ "1$SIGNKEY" != "1" ] && apt-key adv --recv-keys --keyserver keyserver.ubuntu.com $SIGNKEY +[ "1$EXTERNAL" != "1" ] && eval echo "$EXTERNAL" >> ${LOCAL_APT}/etc/apt.sources.list -apt-get update -apt-get install --force-yes -y devscripts +[ "1$SIGNKEY" != "1" ] && apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --recv-keys --keyserver keyserver.ubuntu.com $SIGNKEY + +apt-get update -c $LOCAL_APT/etc/apt.conf if [ $PACKAGE = linux ] then @@ -104,8 +114,7 @@ then apt-get source linux-libc-dev --download-only dpkg-source -x --skip-patches *.dsc source else - [ 1$LOCALDEPENDS = 1true ] || apt-get --force-yes -y build-dep $PACKAGE - apt-get source $PACKAGE --download-only + apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf dpkg-source -x --skip-patches *.dsc source fi @@ -122,12 +131,7 @@ do done compile(){ -if [ 1$LOCALDEPENDS = 1true ] -then - DEPENDS=$(/bin/sed -n '/Build-Dep/,/^[a-zA-W0-9]/ p' debian/control | head -n -1 | /bin/sed 's/.*://; s/(.*)//; s/\[.*\]//; s/,//g' |xargs echo -n) - echo Installing Build-Depends: $DEPENDS - apt-get --force-yes -y install $DEPENDS -fi + PROCESSORS=1 if [ 1$PARALLEL != "1false" ] @@ -135,22 +139,17 @@ then PROCESSORS=$(grep processor /proc/cpuinfo | wc -l) fi + if [ 1$QUILT != 1skip ]; then export QUILT_PATCHES=debian/patches [ -s debian/patches/series ] && quilt push -a fi -if [ $FAKEROOT ] -then -/bin/sed '/nobody/ s_/usr/sbin/nologin_/bin/bash_' -i /etc/passwd -chown nobody ../ -R -su nobody -c 'dpkg-buildpackage -us -uc -j$PROCESSORS -rfakeroot' -else -dpkg-buildpackage -us -uc -j$PROCESSORS -fi +cd .. +dpkg-source -b source +rm -rf ${LOCAL_APT} +echo "Trisquel source package built!" -rm /CurrentlyBuilding -umount /proc } sedhelper2(){ From 642508b7f4f20b74e89c179cfa8c206f03f3afcf Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Tue, 9 Dec 2014 21:51:05 +0100 Subject: [PATCH 02/10] Create blank trusted.gpg and use only deb-src sources --- helpers/config | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/helpers/config b/helpers/config index 9caad0d..7165bbf 100755 --- a/helpers/config +++ b/helpers/config @@ -71,7 +71,7 @@ mkdir -p ${LOCAL_APT}/var/cache/apt/archives/partial mkdir -p ${LOCAL_APT}/etc/ mkdir -p ${LOCAL_APT}/var/lib/dpkg touch ${LOCAL_APT}/var/lib/dpkg/status -cp /etc/apt/trusted.gpg ${LOCAL_APT}/etc/trusted.gpg +touch ${LOCAL_APT}/etc/trusted.gpg cat << EOF > ${LOCAL_APT}/etc/apt.conf Dir::State "${LOCAL_APT}/var/lib/apt"; @@ -82,24 +82,16 @@ pkgCacheGen::Essential "none"; Dir::Etc::Trusted "${LOCAL_APT}/etc/trusted.gpg"; EOF +#Trisquel key +apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys B4EFB9F38D8AEBF1 +#Ubuntu gpg keys apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 - cat << EOF > ${LOCAL_APT}/etc/apt.sources.list -deb $MIRROR $UPSTREAM main universe -deb $MIRROR $UPSTREAM-updates main universe -deb $MIRROR $UPSTREAM-security main universe deb-src $MIRROR $UPSTREAM main universe deb-src $MIRROR $UPSTREAM-updates main universe deb-src $MIRROR $UPSTREAM-security main universe - -#deb $LOCALMIRROR $CODENAME main -#deb $LOCALMIRROR $CODENAME-updates main -#deb $LOCALMIRROR $CODENAME-security main - -deb $DEVELMIRROR $CODENAME main -#deb-src $DEVELMIRROR $CODENAME main EOF [ "1$EXTERNAL" != "1" ] && eval echo "$EXTERNAL" >> ${LOCAL_APT}/etc/apt.sources.list From 6d5858c1f30fd0c183f35fff8d188d48db7b6614 Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Tue, 9 Dec 2014 22:03:15 +0100 Subject: [PATCH 03/10] Export LC_CTIME too --- helpers/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/config b/helpers/config index 7165bbf..3258ca1 100755 --- a/helpers/config +++ b/helpers/config @@ -18,7 +18,7 @@ # set -e -export LANG=C +export LANG=C LC_TIME=C PACKAGE=$(echo $0 |/bin/sed s/make-//g) From ffe01d5c2508de2a6c1687fa39151bd13de8dbcd Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Thu, 11 Dec 2014 23:23:28 +0100 Subject: [PATCH 04/10] Avoid special case for linux package --- helpers/config | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/helpers/config b/helpers/config index 3258ca1..e7d4c3d 100755 --- a/helpers/config +++ b/helpers/config @@ -92,6 +92,7 @@ cat << EOF > ${LOCAL_APT}/etc/apt.sources.list deb-src $MIRROR $UPSTREAM main universe deb-src $MIRROR $UPSTREAM-updates main universe deb-src $MIRROR $UPSTREAM-security main universe + EOF [ "1$EXTERNAL" != "1" ] && eval echo "$EXTERNAL" >> ${LOCAL_APT}/etc/apt.sources.list @@ -100,15 +101,9 @@ EOF apt-get update -c $LOCAL_APT/etc/apt.conf -if [ $PACKAGE = linux ] -then - apt-get --force-yes -y build-dep linux-libc-dev - apt-get source linux-libc-dev --download-only - dpkg-source -x --skip-patches *.dsc source -else - apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf - dpkg-source -x --skip-patches *.dsc source -fi +#Get package and uncompress it +apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf +dpkg-source -x --skip-patches *.dsc source find -maxdepth 1 -type f | xargs rm cd source From 416ae9a8417874d932864f64ee51227710151a88 Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Fri, 12 Dec 2014 16:48:03 +0100 Subject: [PATCH 05/10] Avoid installing packages and moving files outside path --- helpers/make-ubuntu-release-upgrader | 7 ------- 1 file changed, 7 deletions(-) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 9305893..916022d 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -35,10 +35,6 @@ sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropp sed '/nvidia/d' DistUpgrade/build-tarball.sh -i rm tests/test-data/xorg.conf.fglrx -#% Make sure nvidia-common and fglrx-modaliases are not installed -apt-get remove --purge -y nvidia-common || true -apt-get remove --purge -y fglrx-modaliases || true - #https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740 cat << EOF >> DistUpgrade/DistUpgradeQuirks.py @@ -195,7 +191,6 @@ EOF rm DistUpgrade/EOLReleaseAnnouncement.html DistUpgrade/ReleaseAnnouncement.html -apt-get install -q -y parsewiki parsewiki DistUpgrade/EOLReleaseAnnouncement > DistUpgrade/EOLReleaseAnnouncement.html parsewiki DistUpgrade/ReleaseAnnouncement > DistUpgrade/ReleaseAnnouncement.html @@ -267,7 +262,6 @@ replace changelogs.ubuntu.com packages.trisquel.info . /bin/sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/ Date: Fri, 12 Dec 2014 23:39:26 +0100 Subject: [PATCH 06/10] Avoid failing in symbolic links, search only for regular files --- helpers/make-ubuntu-release-upgrader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 916022d..49ca870 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -260,7 +260,7 @@ chmod 755 DistUpgrade/trisquel-postinstall.sh replace changelogs.ubuntu.com packages.trisquel.info . -/bin/sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/ Date: Sun, 14 Dec 2014 18:57:11 +0100 Subject: [PATCH 07/10] Removed the obsolete list from ubuntu It wasn't a build-dep, and the only contents were packages not avaliable in trisquel. --- helpers/make-ubuntu-release-upgrader | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 49ca870..6d1e662 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2008-2010 Rubén Rodríguez +# Copyright (C) 2014 Santiago Rodriguez # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,8 +21,9 @@ # Note that you would need to publish and sign the upgrade tarball # gpg -ba release_name.tar.gz # Also, don't forget to update the meta-release files at archive and packages.t.i +# The "obsoletes" list from ubuntu has been removed -VERSION=10 +VERSION=11 . ./config @@ -317,6 +319,10 @@ for i in core gtk qt; do sed "/Package: trisquel-release-upgrader-$i/ s/$/\nProvides: ubuntu-release-upgrader-$i/" -i debian/control done +#ubuntu-drivers-common is not a build-dep, nor avaliable in trisquel. +sed -i 's/cp \/usr\/share\/ubuntu-drivers-common\/obsolete/touch/g' DistUpgrade/build-tarball.sh + + changelog "Compiled for Trisquel" PARALLEL=false compile From de19d46d2e15f6260c9d81c7f2216e8b113e48c6 Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Sun, 14 Dec 2014 19:30:18 +0100 Subject: [PATCH 08/10] Use local trusted.gpg when avaliable --- helpers/config | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/helpers/config b/helpers/config index e7d4c3d..2761913 100755 --- a/helpers/config +++ b/helpers/config @@ -57,10 +57,6 @@ echo | dch -D $CODENAME -v $(/bin/sed -n '1s/^.*(\(.*\)).*/\1'+${REVISION}trisqu /bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers $DATE/" -i debian/changelog } -rm -rf PACKAGES/$PACKAGE -mkdir PACKAGES/$PACKAGE -cd PACKAGES/$PACKAGE - #Setup local apt @@ -82,11 +78,17 @@ pkgCacheGen::Essential "none"; Dir::Etc::Trusted "${LOCAL_APT}/etc/trusted.gpg"; EOF +if [ -f trusted.local.gpg ] +then +cp trusted.local.gpg "${LOCAL_APT}/etc/trusted.gpg" +else #Trisquel key apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys B4EFB9F38D8AEBF1 #Ubuntu gpg keys apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 +fi + cat << EOF > ${LOCAL_APT}/etc/apt.sources.list deb-src $MIRROR $UPSTREAM main universe @@ -99,9 +101,13 @@ EOF [ "1$SIGNKEY" != "1" ] && apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --recv-keys --keyserver keyserver.ubuntu.com $SIGNKEY -apt-get update -c $LOCAL_APT/etc/apt.conf +#Cleanup +rm -rf PACKAGES/$PACKAGE +mkdir PACKAGES/$PACKAGE +cd PACKAGES/$PACKAGE #Get package and uncompress it +apt-get update -c $LOCAL_APT/etc/apt.conf apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf dpkg-source -x --skip-patches *.dsc source From cc0264407553f5fc6da7e010b386835fae373e6b Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Sun, 14 Dec 2014 19:30:57 +0100 Subject: [PATCH 09/10] Update copyright --- helpers/config | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/config b/helpers/config index 2761913..89908f4 100755 --- a/helpers/config +++ b/helpers/config @@ -1,6 +1,7 @@ #!/bin/bash # # Copyright (C) 2008-2010 Rubén Rodríguez +# Copyright (C) 2014 Santiago Rodriguez # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by From cdbee7e0b3b1513756b221749d1dbdbd518ad3fe Mon Sep 17 00:00:00 2001 From: "Andrew M. 'Leny' Lindley" Date: Mon, 15 Dec 2014 07:32:39 +0000 Subject: [PATCH 10/10] remove crontab2english.pl and references to it for FSDG reasons As per leny2010/package-helpers#5 --- helpers/make-cron | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 helpers/make-cron diff --git a/helpers/make-cron b/helpers/make-cron new file mode 100644 index 0000000..649898f --- /dev/null +++ b/helpers/make-cron @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Copyright (C) 2014 Andrew M. Lindley +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 + +. ./config + +rm debian/examples/crontab2english.pl + +sed '/crontab2english.pl/,/License: Artistic/d;/License: Artistic/,/common-licenses/d' -i debian/copyright + +changelog "Removed non-free example #10868" + +compile +