Merge branch 'v2-helpers-as-user' into 'belenos'

V2 helpers as user

See merge request !7

helpers/config

@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 #    Copyright (C) 2008-2010  Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C)      2014  Santiago Rodriguez <santi@trisquel.info>
 #
 #    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
@@ -18,29 +19,20 @@
 #
 
 set -e
-
+export LANG=C LC_TIME=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
+    export NO_PKG_MANGLE=1
-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
 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 +46,7 @@ export UPSTREAMRELEASE=14.04
 MIRROR=http://archive.ubuntu.com/ubuntu
 DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME
 LOCALMIRROR=http://archive.trisquel.info/trisquel
-
+LOCAL_APT=`mktemp -d` 
-cat << EOF > /etc/lsb-release 
-DISTRIB_ID=Trisquel
-DISTRIB_RELEASE=$REVISION
-DISTRIB_CODENAME=$CODENAME
-DISTRIB_DESCRIPTION="Trisquel $REVISION"
-EOF
 
 replace(){
 find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i s^"$1"^"$2"^g {} \;
@@ -72,42 +58,59 @@ echo | dch -D $CODENAME -v $(/bin/sed -n '1s/^.*(\(.*\)).*/\1'+${REVISION}trisqu
 /bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info>  $DATE/" -i debian/changelog
 }
 
-rm -rf PACKAGES/$PACKAGE
-mkdir PACKAGES/$PACKAGE
-cd PACKAGES/$PACKAGE
 
-cat << EOF > /etc/apt/sources.list
+#Setup local apt
-deb $MIRROR $UPSTREAM main universe
+
-deb $MIRROR $UPSTREAM-updates main universe
+trap "rm -rf ${LOCAL_APT}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
-deb $MIRROR $UPSTREAM-security main universe
+
+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
+touch ${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
+
+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
 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" >> /etc/apt/sources.list
+[ "1$EXTERNAL" != "1" ] && eval echo "$EXTERNAL" >> ${LOCAL_APT}/etc/apt.sources.list
-[ "1$SIGNKEY" != "1" ] && apt-key adv --recv-keys --keyserver keyserver.ubuntu.com $SIGNKEY
 
-apt-get update
+[ "1$SIGNKEY" != "1" ] && apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --recv-keys --keyserver keyserver.ubuntu.com $SIGNKEY
-apt-get install --force-yes -y devscripts
 
-if [ $PACKAGE = linux ]
+#Cleanup
-then
+rm -rf PACKAGES/$PACKAGE
-    apt-get --force-yes -y build-dep linux-libc-dev
+mkdir PACKAGES/$PACKAGE
-    apt-get source linux-libc-dev --download-only
+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
-else
-    [ 1$LOCALDEPENDS = 1true ] || apt-get --force-yes -y build-dep $PACKAGE
-    apt-get source $PACKAGE --download-only
-    dpkg-source -x --skip-patches *.dsc source
-fi
 
 find -maxdepth 1 -type f | xargs rm
 cd source
@@ -122,12 +125,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 +133,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 ]
+cd ..
-then
+dpkg-source -b source
-/bin/sed '/nobody/ s_/usr/sbin/nologin_/bin/bash_' -i /etc/passwd
+rm -rf ${LOCAL_APT}
-chown nobody ../ -R
+echo "Trisquel source package built!"
-su nobody -c 'dpkg-buildpackage -us -uc -j$PROCESSORS -rfakeroot'
-else
-dpkg-buildpackage -us -uc -j$PROCESSORS
-fi
 
-rm /CurrentlyBuilding
-umount /proc
 }
 
 sedhelper2(){